| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 DEPS = [ | 5 DEPS = [ |
| 6 'bot_update', | 6 'bot_update', |
| 7 'chromium', | 7 'chromium', |
| 8 'chromium_tests', | 8 'chromium_tests', |
| 9 'gclient', | 9 'gclient', |
| 10 'isolate', | 10 'isolate', |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 'chromium_config': 'chromium', | 326 'chromium_config': 'chromium', |
| 327 'compile_only': False, | 327 'compile_only': False, |
| 328 'testing': { | 328 'testing': { |
| 329 'platform': 'mac', | 329 'platform': 'mac', |
| 330 }, | 330 }, |
| 331 }, | 331 }, |
| 332 'mac_chromium_rel_ng': { | 332 'mac_chromium_rel_ng': { |
| 333 'based_on_main_waterfall': { | 333 'based_on_main_waterfall': { |
| 334 'mastername': 'chromium.mac', | 334 'mastername': 'chromium.mac', |
| 335 'buildername': 'Mac Builder', | 335 'buildername': 'Mac Builder', |
| 336 'testers': ['Mac10.7 Tests (1)'], | 336 'testers': ['Mac10.8 Tests'], |
| 337 }, | 337 }, |
| 338 'testing': { | 338 'testing': { |
| 339 'platform': 'mac', | 339 'platform': 'mac', |
| 340 }, | 340 }, |
| 341 }, | 341 }, |
| 342 'mac_chromium_compile_dbg': { | 342 'mac_chromium_compile_dbg': { |
| 343 'chromium_config_kwargs': { | 343 'chromium_config_kwargs': { |
| 344 'BUILD_CONFIG': 'Debug', | 344 'BUILD_CONFIG': 'Debug', |
| 345 'TARGET_BITS': 32, | 345 'TARGET_BITS': 32, |
| 346 }, | 346 }, |
| (...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1538 'test': 'base_tests', | 1538 'test': 'base_tests', |
| 1539 'args': ['--gtest-filter: *NaCl*.*'], | 1539 'args': ['--gtest-filter: *NaCl*.*'], |
| 1540 }, | 1540 }, |
| 1541 ], | 1541 ], |
| 1542 }) | 1542 }) |
| 1543 ) + | 1543 ) + |
| 1544 api.override_step_data( | 1544 api.override_step_data( |
| 1545 'analyze', | 1545 'analyze', |
| 1546 api.json.output({'invalid_targets': 'invalid target'})) | 1546 api.json.output({'invalid_targets': 'invalid target'})) |
| 1547 ) | 1547 ) |
| OLD | NEW |