Revert of Reland Make a mojo:apptests GN meta-target, add apptests (p…

…atchset #5 id:80001 of https://codereview.chromium.org/1093883002/) Reason for revert: Causing compile failures: http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/46775 http://build.chromium.org/p/chromium.webkit/builders/Linux%20ChromiumOS%20Builder/builds/66769 http://build.chromium.org/p/chromium.webkit/builders/GPU%20Mac%20Builder%20%28dbg%29/builds/33994 Original issue's description: > Reland Make a mojo:apptests GN meta-target, add apptests. > > Originally landed as https://codereview.chromium.org/1050233005/ > > Add test and apptest meta-targets in mojo/services/BUILD.gn. > Add most remaining test and apptest targets (clipboard, VM, WM). > (mojo shell apptests target is currently broken/no-op) > Allow debug, but exclude component and Mac configs as needed. > Rename and consolidate VM and WM apptest targets. > > BUG=NONE > TEST=Building mojo:apptests builds all local apptest binaries (on dbg too!). > R=sky@chromium.org > TBR=ben@chromium.org > > Committed: https://crrev.com/713b3a495380d37e0adf86a0ada837bb651156ec > Cr-Commit-Position: refs/heads/master@{#325711} TBR=ben@chromium.org,sky@chromium.org,msw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=NONE Review URL: https://codereview.chromium.org/1072153003 Cr-Commit-Position: refs/heads/master@{#325720}
ltilve · Apr 17, 2015 · f757a75 · f757a75
1 parent 5954aaf
commit f757a75
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 58 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -684,8 +684,6 @@ group("gn_mojo_targets") {
       "//media/mojo/interfaces:interfaces_python",
       "//media/mojo/services:cdm_service",
       "//media/mojo:tests",
-      "//mojo/services:apptests",
-      "//mojo/services:tests",
       "//net/interfaces:interfaces_dart",
       "//net/interfaces:interfaces_python",
       "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests",
@@ -699,6 +697,14 @@ group("gn_mojo_targets") {
       "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_dart",
       "//third_party/mojo_services/src/window_manager/public/interfaces:interfaces_python",
     ]
+
+    if (!is_debug) {
+      deps += [
+        "//mojo/services/html_viewer:apptests",
+        "//mojo/services/html_viewer:tests",
+        "//mojo/services/network:apptests",
+      ]
+    }
   }
 }
 

diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
@@ -27,7 +27,6 @@ group("services") {
       "//mojo/services/surfaces",
       "//mojo/services/tracing",
       "//mojo/services/view_manager",
-      "//mojo/services/window_manager:lib",
     ]
 
     # TODO(GYP): Make this work.
@@ -37,55 +36,6 @@ group("services") {
         "//mojo/services/kiosk_wm:window_manager",
         "//mojo/services/native_viewport",
         "//mojo/services/view_manager",
-        "//mojo/services/window_manager:lib",
-      ]
-    }
-  }
-}
-
-group("tests") {
-  testonly = true
-  deps = [
-    ":services",
-  ]
-  if (!is_component_build) {
-    deps += [
-      "//mojo/services/html_viewer:tests",
-      "//mojo/services/view_manager:view_manager_service_unittests",
-      "//mojo/services/window_manager:window_manager_unittests",
-    ]
-
-    # TODO(GYP): Make this work.
-    if (is_mac) {
-      deps -= [
-        "//mojo/services/html_viewer:tests",
-        "//mojo/services/view_manager:view_manager_service_unittests",
-        "//mojo/services/window_manager:window_manager_unittests",
-      ]
-    }
-  }
-}
-
-group("apptests") {
-  testonly = true
-  deps = [
-    ":services",
-  ]
-  if (!is_component_build) {
-    deps += [
-      "//mojo/services/clipboard:apptests",
-      "//mojo/services/html_viewer:apptests",
-      "//mojo/services/network:apptests",
-      "//mojo/services/view_manager:apptests",
-      "//mojo/services/window_manager:apptests",
-    ]
-
-    # TODO(GYP): Make this work.
-    if (is_mac) {
-      deps -= [
-        "//mojo/services/html_viewer:apptests",
-        "//mojo/services/view_manager:apptests",
-        "//mojo/services/window_manager:apptests",
       ]
     }
   }

diff --git a/mojo/services/view_manager/BUILD.gn b/mojo/services/view_manager/BUILD.gn
@@ -156,24 +156,37 @@ test("view_manager_service_unittests") {
   }
 }
 
-mojo_native_application("apptests") {
-  output_name = "view_manager_apptests"
+mojo_native_application("mojo_view_manager_client_apptests") {
   testonly = true
 
   sources = [
     "view_manager_client_apptest.cc",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_config",
+    "//mojo/application",
+    "//mojo/application:test_support",
+    "//third_party/mojo_services/src/geometry/public/cpp:cpp",
+    "//third_party/mojo_services/src/view_manager/public/cpp",
+  ]
+}
+
+mojo_native_application("view_manager_service_apptests") {
+  testonly = true
+
+  sources = [
     "view_manager_service_apptest.cc",
   ]
 
   deps = [
     ":test_support",
     "//base",
-    "//base/test:test_config",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/geometry/public/cpp:cpp",
     "//third_party/mojo_services/src/geometry/public/interfaces",
     "//third_party/mojo_services/src/view_manager/public/cpp",
     "//third_party/mojo_services/src/view_manager/public/interfaces",

diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn
@@ -106,8 +106,7 @@ mojo_native_application("test_window_manager") {
   ]
 }
 
-mojo_native_application("apptests") {
-  output_name = "window_manager_apptests"
+mojo_native_application("window_manager_apptests") {
   testonly = true
 
   sources = [