diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 18:40:15 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 18:40:15 +0000 |
| commit | f6a1831a64a9a1af90e89b80ef9f512ddb9f347b (patch) | |
| tree | a2f61cf8e05288cb52bb05a412a00135f57c3e4f /build | |
| parent | 4d26e5196750e7b9bdfea4cf1408d4c67e4ccfb0 (diff) | |
| download | chromium_src-f6a1831a64a9a1af90e89b80ef9f512ddb9f347b.zip chromium_src-f6a1831a64a9a1af90e89b80ef9f512ddb9f347b.tar.gz chromium_src-f6a1831a64a9a1af90e89b80ef9f512ddb9f347b.tar.bz2 | |
Enable APK based tests for all test bundles.
Any new test bundle should be APK enabled by default.
BUG=125059
TEST=
Review URL: https://chromiumcodereview.appspot.com/10458055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all_android.gyp | 3 | ||||
| -rwxr-xr-x | build/android/run_tests.py | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index dfd4479..4ac5b71 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -59,6 +59,9 @@ # Unit test bundles packaged as an apk. '../base/base.gyp:base_unittests_apk', '../content/content.gyp:content_unittests_apk', + '../gpu/gpu.gyp:gpu_unittests_apk', + '../sql/sql.gyp:sql_unittests_apk', + '../sync/sync.gyp:sync_unit_tests_apk', '../ipc/ipc.gyp:ipc_tests_apk', '../net/net.gyp:net_unittests_apk', '../ui/ui.gyp:ui_unittests_apk', diff --git a/build/android/run_tests.py b/build/android/run_tests.py index 76ca4f9..e9e1d70 100755 --- a/build/android/run_tests.py +++ b/build/android/run_tests.py @@ -76,14 +76,6 @@ _TEST_SUITES = ['base_unittests', 'ui_unittests', ] -# Test suites which are run as APK. This will be replaced by the default -# list when we start building all suites as APK. -_APK_TEST_SUITES = ['base_unittests', - 'content_unittests', - 'ipc_tests', - 'net_unittests', - ] - def FullyQualifiedTestSuites(apk): """Return a fully qualified list that represents all known suites. @@ -97,7 +89,7 @@ def FullyQualifiedTestSuites(apk): suites = [os.path.join(test_suite_dir, t + '_apk', t + '-debug.apk') - for t in _APK_TEST_SUITES] + for t in _TEST_SUITES] else: suites = [os.path.join(test_suite_dir, t) for t in _TEST_SUITES] return suites |