| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables' : { | 5 'variables' : { |
| 6 'pyautolib_sources': [ | 6 'pyautolib_sources': [ |
| 7 'app/chrome_command_ids.h', | 7 'app/chrome_command_ids.h', |
| 8 'app/chrome_dll_resource.h', | 8 'app/chrome_dll_resource.h', |
| 9 'common/automation_constants.h', | 9 'common/automation_constants.h', |
| 10 'common/pref_names.cc', | 10 'common/pref_names.cc', |
| (...skipping 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2557 ['win_use_allocator_shim==1', { | 2557 ['win_use_allocator_shim==1', { |
| 2558 'dependencies': [ | 2558 'dependencies': [ |
| 2559 '<(allocator_target)', | 2559 '<(allocator_target)', |
| 2560 ], | 2560 ], |
| 2561 }], | 2561 }], |
| 2562 ], | 2562 ], |
| 2563 }], | 2563 }], |
| 2564 ], | 2564 ], |
| 2565 }, | 2565 }, |
| 2566 { | 2566 { |
| 2567 'target_name': 'unit_tests_run', | |
| 2568 'type': 'none', | |
| 2569 'dependencies': [ | |
| 2570 'unit_tests', | |
| 2571 ], | |
| 2572 'includes': [ | |
| 2573 'unit_tests.isolate', | |
| 2574 ], | |
| 2575 'actions': [ | |
| 2576 { | |
| 2577 'action_name': 'isolate', | |
| 2578 'inputs': [ | |
| 2579 '<@(isolate_dependency_tracked)', | |
| 2580 ], | |
| 2581 'outputs': [ | |
| 2582 '<(PRODUCT_DIR)/unit_tests.results', | |
| 2583 ], | |
| 2584 'action': [ | |
| 2585 'python', | |
| 2586 '../tools/isolate/isolate.py', | |
| 2587 '<(test_isolation_mode)', | |
| 2588 '--outdir', '<(test_isolation_outdir)', | |
| 2589 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', | |
| 2590 '--variable', 'OS', '<(OS)', | |
| 2591 '--result', '<@(_outputs)', | |
| 2592 '--isolate', 'unit_tests.isolate', | |
| 2593 ], | |
| 2594 }, | |
| 2595 ], | |
| 2596 }, | |
| 2597 { | |
| 2598 # Executable that runs each browser test in a new process. | 2567 # Executable that runs each browser test in a new process. |
| 2599 'target_name': 'browser_tests', | 2568 'target_name': 'browser_tests', |
| 2600 'type': 'executable', | 2569 'type': 'executable', |
| 2601 'msvs_cygwin_shell': 0, | 2570 'msvs_cygwin_shell': 0, |
| 2602 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 2571 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
| 2603 'dependencies': [ | 2572 'dependencies': [ |
| 2604 'browser', | 2573 'browser', |
| 2605 '../sync/protocol/sync_proto.gyp:sync_proto', | 2574 '../sync/protocol/sync_proto.gyp:sync_proto', |
| 2606 'chrome_resources.gyp:chrome_resources', | 2575 'chrome_resources.gyp:chrome_resources', |
| 2607 'chrome_resources.gyp:chrome_strings', | 2576 'chrome_resources.gyp:chrome_strings', |
| (...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3308 ]}, | 3277 ]}, |
| 3309 ], | 3278 ], |
| 3310 ['use_aura==0', { | 3279 ['use_aura==0', { |
| 3311 'sources!': [ | 3280 'sources!': [ |
| 3312 'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.c
c', | 3281 'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.c
c', |
| 3313 ], | 3282 ], |
| 3314 }], | 3283 }], |
| 3315 ], # conditions | 3284 ], # conditions |
| 3316 }, # target browser_tests | 3285 }, # target browser_tests |
| 3317 { | 3286 { |
| 3318 'target_name': 'browser_tests_run', | |
| 3319 'type': 'none', | |
| 3320 'dependencies': [ | |
| 3321 'browser_tests', | |
| 3322 ], | |
| 3323 'includes': [ | |
| 3324 'browser_tests.isolate', | |
| 3325 ], | |
| 3326 'actions': [ | |
| 3327 { | |
| 3328 'action_name': 'isolate', | |
| 3329 'inputs': [ | |
| 3330 '<@(isolate_dependency_tracked)', | |
| 3331 ], | |
| 3332 'outputs': [ | |
| 3333 '<(PRODUCT_DIR)/browser_tests.results', | |
| 3334 ], | |
| 3335 'action': [ | |
| 3336 'python', | |
| 3337 '../tools/isolate/isolate.py', | |
| 3338 '<(test_isolation_mode)', | |
| 3339 '--outdir', '<(test_isolation_outdir)', | |
| 3340 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', | |
| 3341 '--variable', 'OS', '<(OS)', | |
| 3342 '--result', '<@(_outputs)', | |
| 3343 '--isolate', 'browser_tests.isolate', | |
| 3344 ], | |
| 3345 }, | |
| 3346 ], | |
| 3347 }, | |
| 3348 { | |
| 3349 # Executable that runs each perf browser test in a new process. | 3287 # Executable that runs each perf browser test in a new process. |
| 3350 'target_name': 'performance_browser_tests', | 3288 'target_name': 'performance_browser_tests', |
| 3351 'type': 'executable', | 3289 'type': 'executable', |
| 3352 'msvs_cygwin_shell': 0, | 3290 'msvs_cygwin_shell': 0, |
| 3353 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 3291 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
| 3354 'dependencies': [ | 3292 'dependencies': [ |
| 3355 'browser', | 3293 'browser', |
| 3356 '../sync/protocol/sync_proto.gyp:sync_proto', | 3294 '../sync/protocol/sync_proto.gyp:sync_proto', |
| 3357 'chrome_resources.gyp:chrome_resources', | 3295 'chrome_resources.gyp:chrome_resources', |
| 3358 'chrome_resources.gyp:chrome_strings', | 3296 'chrome_resources.gyp:chrome_strings', |
| (...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4624 'test_suite_name': 'unit_tests', | 4562 'test_suite_name': 'unit_tests', |
| 4625 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test
s<(SHARED_LIB_SUFFIX)', | 4563 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_test
s<(SHARED_LIB_SUFFIX)', |
| 4626 'input_jars_paths': [ | 4564 'input_jars_paths': [ |
| 4627 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', | 4565 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', |
| 4628 ], | 4566 ], |
| 4629 }, | 4567 }, |
| 4630 'includes': [ '../build/apk_test.gypi' ], | 4568 'includes': [ '../build/apk_test.gypi' ], |
| 4631 }, | 4569 }, |
| 4632 ], | 4570 ], |
| 4633 }], | 4571 }], |
| 4572 ['test_isolation_mode != "noop"', { |
| 4573 'targets': [ |
| 4574 { |
| 4575 'target_name': 'unit_tests_run', |
| 4576 'type': 'none', |
| 4577 'dependencies': [ |
| 4578 'unit_tests', |
| 4579 ], |
| 4580 'includes': [ |
| 4581 'unit_tests.isolate', |
| 4582 ], |
| 4583 'actions': [ |
| 4584 { |
| 4585 'action_name': 'isolate', |
| 4586 'inputs': [ |
| 4587 '<@(isolate_dependency_tracked)', |
| 4588 ], |
| 4589 'outputs': [ |
| 4590 '<(PRODUCT_DIR)/unit_tests.results', |
| 4591 ], |
| 4592 'action': [ |
| 4593 'python', |
| 4594 '../tools/isolate/isolate.py', |
| 4595 '<(test_isolation_mode)', |
| 4596 '--outdir', '<(test_isolation_outdir)', |
| 4597 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
| 4598 '--variable', 'OS', '<(OS)', |
| 4599 '--result', '<@(_outputs)', |
| 4600 '--isolate', 'unit_tests.isolate', |
| 4601 ], |
| 4602 }, |
| 4603 ], |
| 4604 }, |
| 4605 { |
| 4606 'target_name': 'browser_tests_run', |
| 4607 'type': 'none', |
| 4608 'dependencies': [ |
| 4609 'browser_tests', |
| 4610 ], |
| 4611 'includes': [ |
| 4612 'browser_tests.isolate', |
| 4613 ], |
| 4614 'actions': [ |
| 4615 { |
| 4616 'action_name': 'isolate', |
| 4617 'inputs': [ |
| 4618 '<@(isolate_dependency_tracked)', |
| 4619 ], |
| 4620 'outputs': [ |
| 4621 '<(PRODUCT_DIR)/browser_tests.results', |
| 4622 ], |
| 4623 'action': [ |
| 4624 'python', |
| 4625 '../tools/isolate/isolate.py', |
| 4626 '<(test_isolation_mode)', |
| 4627 '--outdir', '<(test_isolation_outdir)', |
| 4628 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
| 4629 '--variable', 'OS', '<(OS)', |
| 4630 '--result', '<@(_outputs)', |
| 4631 '--isolate', 'browser_tests.isolate', |
| 4632 ], |
| 4633 }, |
| 4634 ], |
| 4635 }, |
| 4636 ], |
| 4637 }], |
| 4634 ], # 'conditions' | 4638 ], # 'conditions' |
| 4635 } | 4639 } |
| OLD | NEW |