| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 """This recipe runs all isolated tests specified in swarm_hashes property. | 5 """This recipe runs all isolated tests specified in swarm_hashes property. |
| 6 Isolating a test is required in order to run it using this recipe. | 6 Isolating a test is required in order to run it using this recipe. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 DEPS = [ | 9 DEPS = [ |
| 10 'chromium', | 10 'chromium', |
| 11 'isolate', | 11 'isolate', |
| 12 'properties', | 12 'properties', |
| 13 'swarming_client', | 13 'swarming_client', |
| 14 ] | 14 ] |
| 15 | 15 |
| 16 # TODO(nodir): pass these arguments from builder to tester once triggering from | 16 # TODO(nodir): pass these arguments from builder to tester once triggering from |
| 17 # recipes lands. This is needed for ARM testers http://crbug.com/359338 | 17 # recipes lands. This is needed for ARM testers http://crbug.com/359338 |
| 18 test_args = { | 18 test_args = { |
| 19 'browser_tests': ['--gtest-filter="*NaCl*"'], | 19 'browser_tests': ['--gtest-filter="*NaCl*"'], |
| 20 'sandbox_linux_unittests': ['--test-launcher-print-test-stdio=always'], |
| 20 } | 21 } |
| 21 | 22 |
| 22 | 23 |
| 23 def GenSteps(api): | 24 def GenSteps(api): |
| 24 config_name = api.properties.get('chromium_config') or 'chromium' | 25 config_name = api.properties.get('chromium_config') or 'chromium' |
| 25 api.chromium.set_config(config_name) | 26 api.chromium.set_config(config_name) |
| 26 | 27 |
| 27 yield api.swarming_client.checkout() | 28 yield api.swarming_client.checkout() |
| 28 | 29 |
| 29 revision = api.properties['parent_got_revision'] | 30 revision = api.properties['parent_got_revision'] |
| 30 webkit_revision = api.properties['parent_got_webkit_revision'] | 31 webkit_revision = api.properties['parent_got_webkit_revision'] |
| 31 for test in sorted(api.isolate.isolated_tests): | 32 for test in sorted(api.isolate.isolated_tests): |
| 32 yield api.isolate.runtest(test, revision, webkit_revision, | 33 yield api.isolate.runtest(test, revision, webkit_revision, |
| 33 args=test_args.get(test)) | 34 args=test_args.get(test)) |
| 34 | 35 |
| 35 | 36 |
| 36 def GenTests(api): | 37 def GenTests(api): |
| 37 props = api.properties.generic( | 38 props = api.properties.generic( |
| 38 parent_got_revision=123, | 39 parent_got_revision=123, |
| 39 parent_got_webkit_revision=321, | 40 parent_got_webkit_revision=321, |
| 40 parent_got_swarming_client_revision= | 41 parent_got_swarming_client_revision= |
| 41 'ae8085b09e6162b4ec869e430d7d09c16b32b433', | 42 'ae8085b09e6162b4ec869e430d7d09c16b32b433', |
| 42 swarm_hashes={ | 43 swarm_hashes={ |
| 43 "browser_tests": "23f4ed98b3616e695602920b8d6c679091e8d8ce"} | 44 "browser_tests": "23f4ed98b3616e695602920b8d6c679091e8d8ce"} |
| 44 ) | 45 ) |
| 45 | 46 |
| 46 yield api.test('run_isolated_tests') + props | 47 yield api.test('run_isolated_tests') + props |
| OLD | NEW |