Index: build/android/run_tests.py |
diff --git a/build/android/run_tests.py b/build/android/run_tests.py |
index a4727f0fe7b71a649bcc197272eaa714ca2baf9d..3d044266b9eea2805ff9728cf675decf0b5cd9b9 100755 |
--- a/build/android/run_tests.py |
+++ b/build/android/run_tests.py |
@@ -59,22 +59,6 @@ from pylib.utils import time_profile |
from pylib.utils import xvfb |
-_TEST_SUITES = ['base_unittests', |
- 'cc_unittests', |
- 'content_unittests', |
- 'gpu_unittests', |
- 'ipc_tests', |
- 'media_unittests', |
- 'net_unittests', |
- 'sql_unittests', |
- 'sync_unit_tests', |
- 'ui_unittests', |
- 'unit_tests', |
- 'webkit_compositor_bindings_unittests', |
- 'android_webview_unittests', |
- ] |
- |
- |
def FullyQualifiedTestSuites(exe, option_test_suite, build_type): |
"""Get a list of absolute paths to test suite targets. |
@@ -87,7 +71,7 @@ def FullyQualifiedTestSuites(exe, option_test_suite, build_type): |
if option_test_suite: |
all_test_suites = [option_test_suite] |
else: |
- all_test_suites = _TEST_SUITES |
+ all_test_suites = constants.DEFAULT_UNIT_TEST_SUITES |
if exe: |
qualified_test_suites = [os.path.join(test_suite_dir, t) |
@@ -103,7 +87,7 @@ def FullyQualifiedTestSuites(exe, option_test_suite, build_type): |
raise Exception('Test suite %s not found in %s.\n' |
'Supported test suites:\n %s\n' |
'Ensure it has been built.\n' % |
- (t, q, _TEST_SUITES)) |
+ (t, q, constants.DEFAULT_UNIT_TEST_SUITES)) |
return qualified_test_suites |
@@ -239,7 +223,6 @@ def _RunATestSuite(options): |
0 if successful, number of failing tests otherwise. |
""" |
step_name = os.path.basename(options.test_suite).replace('-debug.apk', '') |
- buildbot_report.PrintNamedStep(step_name) |
attached_devices = [] |
buildbot_emulators = [] |
@@ -334,7 +317,7 @@ def Dispatch(options): |
def ListTestSuites(): |
"""Display a list of available test suites.""" |
print 'Available test suites are:' |
- for test_suite in _TEST_SUITES: |
+ for test_suite in constants.DEFAULT_UNIT_TEST_SUITES: |
print test_suite |