| 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 'adb', | 6 'adb', |
| 7 'bisect_tester', | 7 'bisect_tester', |
| 8 'build', | 8 'build', |
| 9 'depot_tools/bot_update', | 9 'depot_tools/bot_update', |
| 10 'chromium', | 10 'chromium', |
| (...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1049 api.json.output({ | 1049 api.json.output({ |
| 1050 'Android Tests': { | 1050 'Android Tests': { |
| 1051 'instrumentation_tests': [ | 1051 'instrumentation_tests': [ |
| 1052 { | 1052 { |
| 1053 'test': 'ChromePublicTest', | 1053 'test': 'ChromePublicTest', |
| 1054 'test_apk': 'one_apk', | 1054 'test_apk': 'one_apk', |
| 1055 'apk_under_test': 'second_apk', | 1055 'apk_under_test': 'second_apk', |
| 1056 'additional_apks': [ | 1056 'additional_apks': [ |
| 1057 'another_apk', | 1057 'another_apk', |
| 1058 'omg_so_many_apks', | 1058 'omg_so_many_apks', |
| 1059 ] | 1059 ], |
| 1060 'render_results_dir': 'chrome/test/data/android/render_t
ests', |
| 1060 } | 1061 } |
| 1061 ], | 1062 ], |
| 1062 }, | 1063 }, |
| 1063 }) | 1064 }) |
| 1064 ) | 1065 ) |
| 1065 ) | 1066 ) |
| 1066 | 1067 |
| 1067 yield ( | 1068 yield ( |
| 1068 api.test('dynamic_instrumentation_nodefault_build') + | 1069 api.test('dynamic_instrumentation_nodefault_build') + |
| 1069 api.properties.generic(mastername='chromium.linux', | 1070 api.properties.generic(mastername='chromium.linux', |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1557 yield ( | 1558 yield ( |
| 1558 api.test('ensure_goma_fail') + | 1559 api.test('ensure_goma_fail') + |
| 1559 api.properties( | 1560 api.properties( |
| 1560 mastername='chromium.fyi', | 1561 mastername='chromium.fyi', |
| 1561 buildername='Linux remote_run Builder', | 1562 buildername='Linux remote_run Builder', |
| 1562 slavename='build1-a1', | 1563 slavename='build1-a1', |
| 1563 buildnumber='77457', | 1564 buildnumber='77457', |
| 1564 path_config='kitchen') + | 1565 path_config='kitchen') + |
| 1565 api.override_step_data('ensure_goma.ensure_installed', retcode=1) | 1566 api.override_step_data('ensure_goma.ensure_installed', retcode=1) |
| 1566 ) | 1567 ) |
| OLD | NEW |