| 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 import re | 5 import re |
| 6 import string | 6 import string |
| 7 | 7 |
| 8 | 8 |
| 9 class Test(object): | 9 class Test(object): |
| 10 """ | 10 """ |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 try: | 159 try: |
| 160 script_args = [] | 160 script_args = [] |
| 161 if self._script_args: | 161 if self._script_args: |
| 162 script_args = ['--args', api.json.input(self._script_args)] | 162 script_args = ['--args', api.json.input(self._script_args)] |
| 163 api.python( | 163 api.python( |
| 164 name, | 164 name, |
| 165 # Enforce that all scripts are in the specified directory | 165 # Enforce that all scripts are in the specified directory |
| 166 # for consistency. | 166 # for consistency. |
| 167 api.path['checkout'].join( | 167 api.path['checkout'].join( |
| 168 'testing', 'scripts', api.path.basename(self._script)), | 168 'testing', 'scripts', api.path.basename(self._script)), |
| 169 args=(api.chromium.get_common_args_for_scripts() + | 169 args=(api.chromium_tests.get_common_args_for_scripts() + |
| 170 script_args + | 170 script_args + |
| 171 ['run', '--output', api.json.output()] + | 171 ['run', '--output', api.json.output()] + |
| 172 run_args), | 172 run_args), |
| 173 step_test_data=lambda: api.json.test_api.output( | 173 step_test_data=lambda: api.json.test_api.output( |
| 174 {'valid': True, 'failures': []})) | 174 {'valid': True, 'failures': []})) |
| 175 finally: | 175 finally: |
| 176 self._test_runs[suffix] = api.step.active_result | 176 self._test_runs[suffix] = api.step.active_result |
| 177 | 177 |
| 178 return self._test_runs[suffix] | 178 return self._test_runs[suffix] |
| 179 | 179 |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1242 GTestTest('ui_base_unittests'), | 1242 GTestTest('ui_base_unittests'), |
| 1243 GTestTest('ui_ios_unittests'), | 1243 GTestTest('ui_ios_unittests'), |
| 1244 GTestTest('sync_unit_tests'), | 1244 GTestTest('sync_unit_tests'), |
| 1245 GTestTest('sql_unittests'), | 1245 GTestTest('sql_unittests'), |
| 1246 ] | 1246 ] |
| 1247 | 1247 |
| 1248 GOMA_TESTS = [ | 1248 GOMA_TESTS = [ |
| 1249 GTestTest('base_unittests'), | 1249 GTestTest('base_unittests'), |
| 1250 GTestTest('content_unittests'), | 1250 GTestTest('content_unittests'), |
| 1251 ] | 1251 ] |
| OLD | NEW |