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

Unified Diff: mojo/shell/BUILD.gn

Issue 726743002: Fix external_application_unittests and add to mojob.py (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: allow my unittests to compile into an empty test suite on Windows Created 6 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/BUILD.gn ('k') | mojo/shell/external_application_listener_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 38abdaed4a61fe93e5c83dbdf828a863f3881b8c..cfd97a955bfdd31350421cb1b83af7b42d0245ac 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -225,10 +225,11 @@ source_set("external_application_registrar_connection") {
deps = [
":external_application_registrar_bindings",
+ "//mojo/shell/domain_socket"
]
- if (!is_win) {
- deps += [
+ if (is_win) {
+ deps -= [
"//mojo/shell/domain_socket"
]
}
@@ -289,8 +290,7 @@ source_set("test_support") {
]
}
-# GYP version: mojo/mojo.gyp:external_application_tests
-test("external_application_tests") {
+test("external_application_unittests") {
sources = [
"incoming_connection_listener_unittest.cc",
"external_application_listener_unittest.cc",
@@ -310,4 +310,22 @@ test("external_application_tests") {
"//mojo/environment:chromium",
"//mojo/shell/domain_socket:tests",
]
+
+ if (is_win) {
+ sources -= [
+ "incoming_connection_listener_unittest.cc",
+ "external_application_listener_unittest.cc",
+ ]
+
+ deps -= [
+ ":lib",
+ ":external_application_registrar_connection",
+ "//url",
+ "//mojo/application_manager",
+ "//mojo/common",
+ "//mojo/edk/system",
+ "//mojo/environment:chromium",
+ "//mojo/shell/domain_socket:tests",
+ ]
+ }
}
« no previous file with comments | « mojo/BUILD.gn ('k') | mojo/shell/external_application_listener_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698