summaryrefslogtreecommitdiffstats
path: root/BUILD.gn
diff options
context:
space:
mode:
authorschenney <schenney@chromium.org>2015-04-17 14:25:05 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-17 21:25:20 +0000
commitf757a75714ec2e15db2258b289de7b136c9798f3 (patch)
tree19a736b41e5f1ec5d1385b5f8a71624b42e16aeb /BUILD.gn
parent5954aaf89c97ce1cbd407ddbb5e206750a00b818 (diff)
downloadchromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.zip
chromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.tar.gz
chromium_src-f757a75714ec2e15db2258b289de7b136c9798f3.tar.bz2
Revert of Reland Make a mojo:apptests GN meta-target, add apptests (patchset #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}
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn10
1 files changed, 8 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index bb06157..85dacb8 100644
--- 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",
+ ]
+ }
}
}