Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1546)

Unified Diff: mojo/edk/test/BUILD.gn

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/test/BUILD.gn
diff --git a/third_party/mojo/src/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
similarity index 51%
copy from third_party/mojo/src/mojo/edk/test/BUILD.gn
copy to mojo/edk/test/BUILD.gn
index 834d837ac2ae47e90d34abe27dec5389330da060..a53907d97c1433ffee353d778ed7920da578a550 100644
--- a/third_party/mojo/src/mojo/edk/test/BUILD.gn
+++ b/mojo/edk/test/BUILD.gn
@@ -21,12 +21,10 @@ mojo_edk_source_set("test_support") {
deps = [
"//base",
"//base/test:test_support",
+ "//mojo/edk/system",
"//testing/gtest",
+ "//third_party/mojo/src/mojo/public/cpp/system",
]
-
- mojo_edk_deps = [ "mojo/edk/system" ]
-
- mojo_sdk_public_deps = [ "mojo/public/cpp/system" ]
}
mojo_edk_source_set("run_all_unittests") {
@@ -36,15 +34,14 @@ mojo_edk_source_set("run_all_unittests") {
]
deps = [
+ ":test_support",
":test_support_impl",
"//base",
"//base/test:test_support",
+ "//mojo/edk/system",
"//testing/gtest",
+ "//third_party/mojo/src/mojo/public/c/test_support",
]
-
- mojo_edk_deps = [ "mojo/edk/system" ]
-
- mojo_sdk_deps = [ "mojo/public/c/test_support" ]
}
mojo_edk_source_set("run_all_perftests") {
@@ -53,11 +50,13 @@ mojo_edk_source_set("run_all_perftests") {
":test_support_impl",
"//base",
"//base/test:test_support",
- ]
-
- mojo_edk_deps = [ "mojo/edk/system" ]
+ "//mojo/edk/system",
- mojo_sdk_deps = [ "mojo/public/c/test_support" ]
+ # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
+ # declared in third party only for now.
+ "//third_party/mojo/src/mojo/edk/system",
+ "//third_party/mojo/src/mojo/public/c/test_support",
+ ]
sources = [
"run_all_perftests.cc",
@@ -69,12 +68,10 @@ mojo_edk_source_set("test_support_impl") {
deps = [
"//base",
"//base/test:test_support",
+ "//third_party/mojo/src/mojo/public/c/test_support",
+ "//third_party/mojo/src/mojo/public/cpp/system",
]
- mojo_sdk_deps = [ "mojo/public/c/test_support" ]
-
- mojo_sdk_public_deps = [ "mojo/public/cpp/system" ]
-
sources = [
"test_support_impl.cc",
"test_support_impl.h",
@@ -89,13 +86,13 @@ mojo_edk_source_set("test_support_impl") {
group("public_tests") {
testonly = true
deps = [
- ":mojo_public_bindings_perftests",
- ":mojo_public_bindings_unittests",
- ":mojo_public_environment_unittests",
- ":mojo_public_system_perftests",
- ":mojo_public_system_unittests",
- ":mojo_public_utility_unittests",
- ":mojo_system_impl_private_unittests",
+ # TODO(use_chrome_edk): remove "2"
+ ":mojo_public_bindings_unittests2",
+ ":mojo_public_environment_unittests2",
+ ":mojo_public_system_perftests2",
+ ":mojo_public_system_unittests2",
+ ":mojo_public_utility_unittests2",
+ ":mojo_system_impl_private_unittests2",
]
if (mojo_use_application_in_sdk) {
@@ -104,59 +101,59 @@ group("public_tests") {
}
if (mojo_use_application_in_sdk) {
- test("mojo_public_application_unittests") {
+ # TODO(use_chrome_edk): remove "2"
+ test("mojo_public_application_unittests2") {
deps = [
":run_all_unittests",
- "../../public/cpp/application/tests",
+ "../../../third_party/mojo/src/mojo/public/cpp/application/tests",
]
}
}
-test("mojo_public_bindings_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_public_bindings_unittests2") {
deps = [
":run_all_unittests",
- "../../public/cpp/bindings/tests",
- ]
-}
-
-test("mojo_public_bindings_perftests") {
- deps = [
- ":run_all_perftests",
- "../../public/cpp/bindings/tests:perftests",
+ "../../../third_party/mojo/src/mojo/public/cpp/bindings/tests",
]
}
-test("mojo_public_environment_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_public_environment_unittests2") {
deps = [
":run_all_unittests",
- "../../public/cpp/environment/tests",
+ "../../../third_party/mojo/src/mojo/public/cpp/environment/tests",
]
}
-test("mojo_public_system_perftests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_public_system_perftests2") {
deps = [
":run_all_perftests",
- "../../public/c/system/tests:perftests",
+ "../../../third_party/mojo/src/mojo/public/c/system/tests:perftests",
]
}
-test("mojo_public_system_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_public_system_unittests2") {
deps = [
":run_all_unittests",
- "../../public/cpp/system/tests",
+ "../../../third_party/mojo/src/mojo/public/cpp/system/tests",
]
}
-test("mojo_public_utility_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_public_utility_unittests2") {
deps = [
":run_all_unittests",
- "../../public/cpp/utility/tests",
+ "../../../third_party/mojo/src/mojo/public/cpp/utility/tests",
]
}
-test("mojo_system_impl_private_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_system_impl_private_unittests2") {
deps = [
":run_all_unittests",
- "../../public/platform/native:system_impl_private_tests",
+ "../../../third_party/mojo/src/mojo/public/platform/native:system_impl_private_tests",
]
}

Powered by Google App Engine
This is Rietveld 408576698