OLD | NEW |
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 import logging | 5 import logging |
6 import os | 6 import os |
7 import sys | 7 import sys |
8 | 8 |
9 from pylib import android_commands | 9 from pylib import android_commands |
10 from pylib import cmd_helper | 10 from pylib import cmd_helper |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 def RunnerFactory(device, shard_index): | 45 def RunnerFactory(device, shard_index): |
46 return test_runner.TestRunner( | 46 return test_runner.TestRunner( |
47 device, | 47 device, |
48 options.test_suite, | 48 options.test_suite, |
49 options.test_arguments, | 49 options.test_arguments, |
50 options.timeout, | 50 options.timeout, |
51 options.cleanup_test_files, | 51 options.cleanup_test_files, |
52 options.tool, | 52 options.tool, |
53 options.build_type, | 53 options.build_type, |
54 options.webkit, | 54 options.webkit, |
| 55 options.push_deps, |
55 constants.BROWSERTEST_TEST_PACKAGE_NAME, | 56 constants.BROWSERTEST_TEST_PACKAGE_NAME, |
56 constants.BROWSERTEST_TEST_ACTIVITY_NAME, | 57 constants.BROWSERTEST_TEST_ACTIVITY_NAME, |
57 constants.BROWSERTEST_COMMAND_LINE_FILE) | 58 constants.BROWSERTEST_COMMAND_LINE_FILE) |
58 | 59 |
59 # Get tests and split them up based on the number of devices. | 60 # Get tests and split them up based on the number of devices. |
60 all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory, | 61 all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory, |
61 attached_devices) | 62 attached_devices) |
62 if options.gtest_filter: | 63 if options.gtest_filter: |
63 all_tests = unittest_util.FilterTestNames(all_enabled, | 64 all_tests = unittest_util.FilterTestNames(all_enabled, |
64 options.gtest_filter) | 65 options.gtest_filter) |
(...skipping 24 matching lines...) Expand all Loading... |
89 def _ShouldRunOnBot(test): | 90 def _ShouldRunOnBot(test): |
90 fixture, case = test.split('.', 1) | 91 fixture, case = test.split('.', 1) |
91 if _StartsWith(fixture, case, "PRE_"): | 92 if _StartsWith(fixture, case, "PRE_"): |
92 return False | 93 return False |
93 if _StartsWith(fixture, case, "MANUAL_"): | 94 if _StartsWith(fixture, case, "MANUAL_"): |
94 return False | 95 return False |
95 return True | 96 return True |
96 | 97 |
97 def _StartsWith(a, b, prefix): | 98 def _StartsWith(a, b, prefix): |
98 return a.startswith(prefix) or b.startswith(prefix) | 99 return a.startswith(prefix) or b.startswith(prefix) |
OLD | NEW |