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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « mojo/BUILD.gn ('k') | mojo/shell/external_application_listener_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//mojo/public/mojo.gni") 6 import("//mojo/public/mojo.gni")
7 import("//mojo/public/tools/bindings/mojom.gni") 7 import("//mojo/public/tools/bindings/mojom.gni")
8 8
9 # We don't support building in the component build since mojo apps are 9 # We don't support building in the component build since mojo apps are
10 # inherently components. 10 # inherently components.
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 218 }
219 219
220 source_set("external_application_registrar_connection") { 220 source_set("external_application_registrar_connection") {
221 sources = [ 221 sources = [
222 "external_application_registrar_connection.cc", 222 "external_application_registrar_connection.cc",
223 "external_application_registrar_connection.h", 223 "external_application_registrar_connection.h",
224 ] 224 ]
225 225
226 deps = [ 226 deps = [
227 ":external_application_registrar_bindings", 227 ":external_application_registrar_bindings",
228 "//mojo/shell/domain_socket"
228 ] 229 ]
229 230
230 if (!is_win) { 231 if (is_win) {
231 deps += [ 232 deps -= [
232 "//mojo/shell/domain_socket" 233 "//mojo/shell/domain_socket"
233 ] 234 ]
234 } 235 }
235 } 236 }
236 237
237 # GYP version: mojo/mojo.gyp:mojo_shell_tests 238 # GYP version: mojo/mojo.gyp:mojo_shell_tests
238 test("mojo_shell_tests") { 239 test("mojo_shell_tests") {
239 sources = [ 240 sources = [
240 "child_process_host_unittest.cc", 241 "child_process_host_unittest.cc",
241 "data_pipe_peek_unittest.cc", 242 "data_pipe_peek_unittest.cc",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 "shell_test_helper.cc", 283 "shell_test_helper.cc",
283 "shell_test_helper.h", 284 "shell_test_helper.h",
284 ] 285 ]
285 286
286 deps = [ 287 deps = [
287 ":lib", 288 ":lib",
288 "//mojo/edk/system", 289 "//mojo/edk/system",
289 ] 290 ]
290 } 291 }
291 292
292 # GYP version: mojo/mojo.gyp:external_application_tests 293 test("external_application_unittests") {
293 test("external_application_tests") {
294 sources = [ 294 sources = [
295 "incoming_connection_listener_unittest.cc", 295 "incoming_connection_listener_unittest.cc",
296 "external_application_listener_unittest.cc", 296 "external_application_listener_unittest.cc",
297 "external_application_test_main.cc", 297 "external_application_test_main.cc",
298 ] 298 ]
299 299
300 deps = [ 300 deps = [
301 ":lib", 301 ":lib",
302 ":external_application_registrar_connection", 302 ":external_application_registrar_connection",
303 "//base", 303 "//base",
304 "//base/test:test_support", 304 "//base/test:test_support",
305 "//testing/gtest", 305 "//testing/gtest",
306 "//url", 306 "//url",
307 "//mojo/application_manager", 307 "//mojo/application_manager",
308 "//mojo/common", 308 "//mojo/common",
309 "//mojo/edk/system", 309 "//mojo/edk/system",
310 "//mojo/environment:chromium", 310 "//mojo/environment:chromium",
311 "//mojo/shell/domain_socket:tests", 311 "//mojo/shell/domain_socket:tests",
312 ] 312 ]
313
314 if (is_win) {
315 sources -= [
316 "incoming_connection_listener_unittest.cc",
317 "external_application_listener_unittest.cc",
318 ]
319
320 deps -= [
321 ":lib",
322 ":external_application_registrar_connection",
323 "//url",
324 "//mojo/application_manager",
325 "//mojo/common",
326 "//mojo/edk/system",
327 "//mojo/environment:chromium",
328 "//mojo/shell/domain_socket:tests",
329 ]
330 }
313 } 331 }
OLDNEW
« 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