| 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 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'All', | 8 'target_name': 'All', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'xcode_create_dependents_test_runner': 1, | 10 'xcode_create_dependents_test_runner': 1, |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 'conditions': [ | 171 'conditions': [ |
| 172 ['OS=="win" and fastbuild==0', { | 172 ['OS=="win" and fastbuild==0', { |
| 173 'dependencies': [ | 173 'dependencies': [ |
| 174 '../chrome/installer/mini_installer_syzygy.gyp:*', | 174 '../chrome/installer/mini_installer_syzygy.gyp:*', |
| 175 ], | 175 ], |
| 176 }, | 176 }, |
| 177 ], | 177 ], |
| 178 ], | 178 ], |
| 179 }, # target_name: All_syzygy | 179 }, # target_name: All_syzygy |
| 180 { | 180 { |
| 181 'target_name': 'chromium_swarm_tests', | |
| 182 'type': 'none', | |
| 183 'dependencies': [ | |
| 184 # Add new dependencies to the !ios section just below, not here (see | |
| 185 # the comment there). | |
| 186 ], | |
| 187 'conditions': [ | |
| 188 ['OS!="ios"', { | |
| 189 'dependencies': [ | |
| 190 # TODO(ios): This is temporary; currently almost nothing builds with | |
| 191 # OS=ios. Move dependencies back to the main dependencies section | |
| 192 # above as gyp files come online. | |
| 193 '../base/base.gyp:base_unittests_run', | |
| 194 '../chrome/chrome.gyp:browser_tests_run', | |
| 195 '../chrome/chrome.gyp:unit_tests_run', | |
| 196 '../net/net.gyp:net_unittests_run', | |
| 197 ], | |
| 198 }], | |
| 199 ], | |
| 200 }, # target_name: chromium_swarm_tests | |
| 201 { | |
| 202 'target_name': 'chromium_builder_tests', | 181 'target_name': 'chromium_builder_tests', |
| 203 'type': 'none', | 182 'type': 'none', |
| 204 'dependencies': [ | 183 'dependencies': [ |
| 205 '../base/base.gyp:base_unittests', | 184 '../base/base.gyp:base_unittests', |
| 206 '../sql/sql.gyp:sql_unittests', | 185 '../sql/sql.gyp:sql_unittests', |
| 207 # Add new dependencies to the !ios section just below, not here (see | 186 # Add new dependencies to the !ios section just below, not here (see |
| 208 # the comment there). | 187 # the comment there). |
| 209 ], | 188 ], |
| 210 'conditions': [ | 189 'conditions': [ |
| 211 ['OS!="ios"', { | 190 ['OS!="ios"', { |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 }], | 667 }], |
| 689 ['chromeos==1', { | 668 ['chromeos==1', { |
| 690 'dependencies': [ | 669 'dependencies': [ |
| 691 '../chromeos/chromeos.gyp:chromeos_unittests', | 670 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 692 ], | 671 ], |
| 693 }], | 672 }], |
| 694 ], | 673 ], |
| 695 }, | 674 }, |
| 696 ], # targets | 675 ], # targets |
| 697 }], # "use_aura==1" | 676 }], # "use_aura==1" |
| 677 ['test_isolation_mode != "noop"', { |
| 678 'targets': [ |
| 679 { |
| 680 'target_name': 'chromium_swarm_tests', |
| 681 'type': 'none', |
| 682 'dependencies': [ |
| 683 '../base/base.gyp:base_unittests_run', |
| 684 '../chrome/chrome.gyp:browser_tests_run', |
| 685 '../chrome/chrome.gyp:unit_tests_run', |
| 686 '../net/net.gyp:net_unittests_run', |
| 687 ], |
| 688 }, # target_name: chromium_swarm_tests |
| 689 ], |
| 690 }], |
| 698 ], # conditions | 691 ], # conditions |
| 699 } | 692 } |
| OLD | NEW |