Move public SDK test targets to //mojo/BUILD.gn (from //mojo/edk/test/BUILD.gn).

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1409123007 .

mojo/BUILD.gn

diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index c01cee0..c268b52 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/module_args/mojo.gni")
 import("//mojo/public/mojo.gni")
+import("//testing/test.gni")
 
 declare_args() {
   mojo_use_go = false
@@ -60,9 +61,9 @@
 group("tests") {
   testonly = true
   deps = [
+    ":public_tests",
     "//mojo/common:mojo_common_unittests",
     "//mojo/edk/system:tests",
-    "//mojo/edk/test:public_tests",
     "//mojo/dart/embedder/test:dart_unittests",
     "//mojo/public/cpp/bindings/tests:versioning_apptests",
     "//mojo/services/view_manager/cpp/tests:mojo_view_manager_lib_unittests",
@@ -89,3 +90,78 @@
     "//mojo/public/platform/native:system",
   ]
 }
+
+# Public SDK test targets follow. These targets are not defined within the
+# public SDK itself since they are built as native executable binaries, needing
+# to be linked with the EDK.
+# TODO(vtl): They should be converted to "apptests", i.e., run as apps.
+
+group("public_tests") {
+  testonly = true
+  deps = [
+    ":mojo_public_application_unittests",
+    ":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",
+  ]
+}
+
+test("mojo_public_application_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/application/tests",
+  ]
+}
+
+test("mojo_public_bindings_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/bindings/tests",
+  ]
+}
+
+test("mojo_public_bindings_perftests") {
+  deps = [
+    "//mojo/edk/test:run_all_perftests",
+    "//mojo/public/cpp/bindings/tests:perftests",
+  ]
+}
+
+test("mojo_public_environment_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/environment/tests",
+  ]
+}
+
+test("mojo_public_system_perftests") {
+  deps = [
+    "//mojo/edk/test:run_all_perftests",
+    "//mojo/public/c/system/tests:perftests",
+  ]
+}
+
+test("mojo_public_system_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/system/tests",
+  ]
+}
+
+test("mojo_public_utility_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/utility/tests",
+  ]
+}
+
+test("mojo_system_impl_private_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/platform/native:system_impl_private_tests",
+  ]
+}

mojo/edk/test/BUILD.gn

diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
index ca96992..9ee2ad1 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.gni")
-import("//testing/test.gni")
 
 mojo_edk_source_set("test_support") {
   testonly = true
@@ -87,78 +86,3 @@
     ":run_all_perftests",
   ]
 }
-
-# Public SDK test targets follow. These targets are not defined within the
-# public SDK itself as running the unittests requires the EDK.
-# TODO(vtl): These don't really belong here. (They should be converted to
-# apptests, but even apart from that these targets belong somewhere else.)
-
-group("public_tests") {
-  testonly = true
-  deps = [
-    ":mojo_public_application_unittests",
-    ":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",
-  ]
-}
-
-test("mojo_public_application_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/cpp/application/tests",
-  ]
-}
-
-test("mojo_public_bindings_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/cpp/bindings/tests",
-  ]
-}
-
-test("mojo_public_bindings_perftests") {
-  deps = [
-    ":run_all_perftests",
-    "../../public/cpp/bindings/tests:perftests",
-  ]
-}
-
-test("mojo_public_environment_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/cpp/environment/tests",
-  ]
-}
-
-test("mojo_public_system_perftests") {
-  deps = [
-    ":run_all_perftests",
-    "../../public/c/system/tests:perftests",
-  ]
-}
-
-test("mojo_public_system_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/cpp/system/tests",
-  ]
-}
-
-test("mojo_public_utility_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/cpp/utility/tests",
-  ]
-}
-
-test("mojo_system_impl_private_unittests") {
-  deps = [
-    ":run_all_unittests",
-    "../../public/platform/native:system_impl_private_tests",
-  ]
-}