Index: build/android/pylib/gtest/gtest_config.py |
diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py |
index 8512dc4e02878c10736ba2766b5fb0fe7990dfee..4438638de079e58f26701c21fa033e3d6645c986 100644 |
--- a/build/android/pylib/gtest/gtest_config.py |
+++ b/build/android/pylib/gtest/gtest_config.py |
@@ -5,30 +5,37 @@ |
"""Configuration file for android gtest suites.""" |
# Add new suites here before upgrading them to the stable list below. |
-EXPERIMENTAL_TEST_SUITES = [ |
- # The JNI version of the sandbox_linux_unittests. Should be changed to |
- # 'sandbox_linux_unittests' once it can be run with --exe. |
- 'sandbox_linux_jni_unittests', |
-] |
+# The outer key is a test configuration option: whether the test is |
+# wrapped with an apk or whether it is exe-based. |
+EXPERIMENTAL_TEST_SUITES = { |
+ False: [], |
frankf
2013/03/12 03:13:15
Let's just use 'apk'/'exe' as keys since it's self
Isaac (away)
2013/03/12 03:19:44
sgtm. I'm going to switch this to namedtuples.
|
+ True: [ |
+ 'sandbox_linux_unittests', |
+ 'breakpad_unittests', |
+ ], |
+} |
# Do not modify this list without approval of an android owner. |
# This list determines which suites are run by default, both for local |
# testing and on android trybots running on commit-queue. |
-STABLE_TEST_SUITES = [ |
- 'TestWebKitAPI', |
- 'android_webview_unittests', |
- 'base_unittests', |
- 'cc_unittests', |
- 'components_unittests', |
- 'content_unittests', |
- 'gpu_unittests', |
- 'ipc_tests', |
- 'media_unittests', |
- 'net_unittests', |
- 'sql_unittests', |
- 'sync_unit_tests', |
- 'ui_unittests', |
- 'unit_tests', |
- 'webkit_compositor_bindings_unittests', |
- 'webkit_unit_tests', |
-] |
+STABLE_TEST_SUITES = { |
+ False: [ |
+ 'TestWebKitAPI', |
+ 'android_webview_unittests', |
+ 'base_unittests', |
+ 'cc_unittests', |
+ 'components_unittests', |
+ 'content_unittests', |
+ 'gpu_unittests', |
+ 'ipc_tests', |
+ 'media_unittests', |
+ 'net_unittests', |
+ 'sql_unittests', |
+ 'sync_unit_tests', |
+ 'ui_unittests', |
+ 'unit_tests', |
+ 'webkit_compositor_bindings_unittests', |
+ 'webkit_unit_tests', |
+ ], |
+ True: [] |
+} |