| 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 2582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2593 # linking errors on 64-bit bots too. http://crbug.com/52555 | 2593 # linking errors on 64-bit bots too. http://crbug.com/52555 |
| 2594 'LinkIncremental': '1', | 2594 'LinkIncremental': '1', |
| 2595 }, | 2595 }, |
| 2596 }, | 2596 }, |
| 2597 }, | 2597 }, |
| 2598 }, | 2598 }, |
| 2599 }], | 2599 }], |
| 2600 ], | 2600 ], |
| 2601 }, | 2601 }, |
| 2602 { | 2602 { |
| 2603 'target_name': 'unit_tests_run', |
| 2604 'type': 'none', |
| 2605 'dependencies': [ |
| 2606 'unit_tests', |
| 2607 ], |
| 2608 'includes': [ |
| 2609 'unit_tests.isolate', |
| 2610 ], |
| 2611 'actions': [ |
| 2612 { |
| 2613 'action_name': 'isolate', |
| 2614 'inputs': [ |
| 2615 '<@(isolate_dependency_tracked)', |
| 2616 ], |
| 2617 'outputs': [ |
| 2618 '<(PRODUCT_DIR)/unit_tests.results', |
| 2619 ], |
| 2620 'action': [ |
| 2621 'python', |
| 2622 '../tools/isolate/isolate.py', |
| 2623 '--mode', '<(tests_run)', |
| 2624 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
| 2625 '--variable', 'OS', '<(OS)', |
| 2626 '--result', '<@(_outputs)', |
| 2627 'unit_tests.isolate', |
| 2628 ], |
| 2629 }, |
| 2630 ], |
| 2631 }, |
| 2632 { |
| 2603 # Executable that runs each browser test in a new process. | 2633 # Executable that runs each browser test in a new process. |
| 2604 'target_name': 'browser_tests', | 2634 'target_name': 'browser_tests', |
| 2605 'type': 'executable', | 2635 'type': 'executable', |
| 2606 'msvs_cygwin_shell': 0, | 2636 'msvs_cygwin_shell': 0, |
| 2607 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 2637 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
| 2608 'copies': [ | 2638 'copies': [ |
| 2609 { | 2639 { |
| 2610 'destination': '<(PRODUCT_DIR)', | 2640 'destination': '<(PRODUCT_DIR)', |
| 2611 'files': [ | 2641 'files': [ |
| 2612 # Keep 'test_case.html.mock-http-headers' with 'test_case.html'. | 2642 # Keep 'test_case.html.mock-http-headers' with 'test_case.html'. |
| (...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4646 # Use outputs of this action as inputs for the main target build. | 4676 # Use outputs of this action as inputs for the main target build. |
| 4647 # Seems as a misnomer but makes this happy on Linux (scons). | 4677 # Seems as a misnomer but makes this happy on Linux (scons). |
| 4648 'process_outputs_as_sources': 1, | 4678 'process_outputs_as_sources': 1, |
| 4649 }, | 4679 }, |
| 4650 ], # 'actions' | 4680 ], # 'actions' |
| 4651 }, | 4681 }, |
| 4652 ] | 4682 ] |
| 4653 }], # 'coverage!=0' | 4683 }], # 'coverage!=0' |
| 4654 ], # 'conditions' | 4684 ], # 'conditions' |
| 4655 } | 4685 } |
| OLD | NEW |