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 datetime | 5 import datetime |
6 import re | 6 import re |
7 import string | 7 import string |
8 | 8 |
9 | 9 |
10 class Test(object): | 10 class Test(object): |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 | 312 |
313 gtest_results_file = api.test_utils.gtest_results(add_json_log=False) | 313 gtest_results_file = api.test_utils.gtest_results(add_json_log=False) |
314 step_test_data = lambda: api.test_utils.test_api.canned_gtest_output(True) | 314 step_test_data = lambda: api.test_utils.test_api.canned_gtest_output(True) |
315 | 315 |
316 kwargs['name'] = self._step_name(suffix) | 316 kwargs['name'] = self._step_name(suffix) |
317 kwargs['args'] = args | 317 kwargs['args'] = args |
318 kwargs['step_test_data'] = step_test_data | 318 kwargs['step_test_data'] = step_test_data |
319 | 319 |
320 if is_android: | 320 if is_android: |
321 kwargs['json_results_file'] = gtest_results_file | 321 kwargs['json_results_file'] = gtest_results_file |
322 kwargs['flakiness_dashboard'] = 'test-results.appspot.com' | |
323 kwargs['shard_timeout'] = self._android_shard_timeout | 322 kwargs['shard_timeout'] = self._android_shard_timeout |
324 kwargs['tool'] = self._android_tool | 323 kwargs['tool'] = self._android_tool |
325 else: | 324 else: |
326 kwargs['xvfb'] = self._use_xvfb | 325 kwargs['xvfb'] = self._use_xvfb |
327 kwargs['test_type'] = self.name | 326 kwargs['test_type'] = self.name |
328 kwargs['annotate'] = 'gtest' | 327 kwargs['annotate'] = 'gtest' |
329 kwargs['test_launcher_summary_output'] = gtest_results_file | 328 kwargs['test_launcher_summary_output'] = gtest_results_file |
330 kwargs.update(self._runtest_kwargs) | 329 kwargs.update(self._runtest_kwargs) |
331 | 330 |
332 try: | 331 try: |
(...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1769 args=args) | 1768 args=args) |
1770 api.gsutil.upload( | 1769 api.gsutil.upload( |
1771 temp_output_dir.join( | 1770 temp_output_dir.join( |
1772 '%s-android-chrome.json' % timestamp_string), | 1771 '%s-android-chrome.json' % timestamp_string), |
1773 'chromium-annotated-tests', 'android') | 1772 'chromium-annotated-tests', 'android') |
1774 | 1773 |
1775 GOMA_TESTS = [ | 1774 GOMA_TESTS = [ |
1776 GTestTest('base_unittests'), | 1775 GTestTest('base_unittests'), |
1777 GTestTest('content_unittests'), | 1776 GTestTest('content_unittests'), |
1778 ] | 1777 ] |
OLD | NEW |