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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
« no previous file with comments | « mojo/edk/system/waiter_unittest.cc ('k') | mojo/edk/test/multiprocess_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/test/BUILD.gn
diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
index 2f5fff5fcd2ab535e02dd096b163b58878489dd9..5f8ec7799d579384f25e629a9a79aac8b53416fa 100644
--- a/mojo/edk/test/BUILD.gn
+++ b/mojo/edk/test/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//mojo/edk/mojo_edk.gni")
-import("//mojo/public/mojo.gni")
import("//testing/test.gni")
mojo_edk_source_set("test_support") {
@@ -21,8 +20,8 @@ mojo_edk_source_set("test_support") {
deps = [
"//base",
"//base/test:test_support",
+ "//mojo/public/cpp/system",
"//testing/gtest",
- "//third_party/mojo/src/mojo/public/cpp/system",
# TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
# declared in third party only for now.
@@ -41,8 +40,8 @@ mojo_edk_source_set("run_all_unittests") {
":test_support_impl",
"//base",
"//base/test:test_support",
+ "//mojo/public/c/test_support",
"//testing/gtest",
- "//third_party/mojo/src/mojo/public/c/test_support",
# TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
# declared in third party only for now.
@@ -56,11 +55,11 @@ mojo_edk_source_set("run_all_perftests") {
":test_support_impl",
"//base",
"//base/test:test_support",
+ "//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 = [
@@ -73,8 +72,8 @@ 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/public/c/test_support",
+ "//mojo/public/cpp/system",
]
sources = [
@@ -98,27 +97,13 @@ group("public_tests") {
":mojo_public_system_unittests2",
":mojo_public_utility_unittests2",
]
-
- if (mojo_use_application_in_sdk) {
- deps += [ ":mojo_public_application_unittests" ]
- }
-}
-
-if (mojo_use_application_in_sdk) {
- # TODO(use_chrome_edk): remove "2"
- test("mojo_public_application_unittests2") {
- deps = [
- ":run_all_unittests",
- "../../../third_party/mojo/src/mojo/public/cpp/application/tests",
- ]
- }
}
# TODO(use_chrome_edk): remove "2"
test("mojo_public_bindings_unittests2") {
deps = [
":run_all_unittests",
- "../../../third_party/mojo/src/mojo/public/cpp/bindings/tests",
+ "//mojo/public/cpp/bindings/tests",
]
}
@@ -126,7 +111,7 @@ test("mojo_public_bindings_unittests2") {
test("mojo_public_environment_unittests2") {
deps = [
":run_all_unittests",
- "../../../third_party/mojo/src/mojo/public/cpp/environment/tests",
+ "//mojo/public/cpp/environment/tests",
]
}
@@ -134,7 +119,7 @@ test("mojo_public_environment_unittests2") {
test("mojo_public_system_perftests2") {
deps = [
":run_all_perftests",
- "../../../third_party/mojo/src/mojo/public/c/system/tests:perftests",
+ "//mojo/public/c/system/tests:perftests",
]
}
@@ -142,7 +127,7 @@ test("mojo_public_system_perftests2") {
test("mojo_public_system_unittests2") {
deps = [
":run_all_unittests",
- "../../../third_party/mojo/src/mojo/public/cpp/system/tests",
+ "//mojo/public/cpp/system/tests",
]
}
@@ -150,6 +135,6 @@ test("mojo_public_system_unittests2") {
test("mojo_public_utility_unittests2") {
deps = [
":run_all_unittests",
- "../../../third_party/mojo/src/mojo/public/cpp/utility/tests",
+ "//mojo/public/cpp/utility/tests",
]
}
« no previous file with comments | « mojo/edk/system/waiter_unittest.cc ('k') | mojo/edk/test/multiprocess_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698