summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 08:12:39 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 08:12:39 +0000
commit26d35e56c0ed0cc8b4eb3af0096c6c630bb934dc (patch)
tree23c199498a08c44d364781a2ec2e9af696ea19eb
parentc2d58b4833d616913627e2028d5dd4e260b071fc (diff)
downloadchromium_src-26d35e56c0ed0cc8b4eb3af0096c6c630bb934dc.zip
chromium_src-26d35e56c0ed0cc8b4eb3af0096c6c630bb934dc.tar.gz
chromium_src-26d35e56c0ed0cc8b4eb3af0096c6c630bb934dc.tar.bz2
Add net, content and ipc to the default list of APK test bundles.
These APK bundles are compiled and run on the android_test try bot. Test run: http://build.chromium.org/p/tryserver.chromium/builders/android_test/builds/117 All tests pass. BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10447050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139497 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all_android.gyp2
-rw-r--r--build/android/gtest_filter/base_unittests_disabled1
-rw-r--r--build/android/gtest_filter/content_unittests_disabled2
-rwxr-xr-xbuild/android/run_tests.py3
4 files changed, 7 insertions, 1 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp
index ad99339..12498e1 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -59,7 +59,9 @@
'../testing/android/native_test.gyp:native_test_apk',
# Unit test bundles packaged as an apk.
'../base/base.gyp:base_unittests_apk',
+ '../content/content.gyp:content_unittests_apk',
'../ipc/ipc.gyp:ipc_tests_apk',
+ '../net/net.gyp:net_unittests_apk',
'../ui/ui.gyp:ui_unittests_apk',
],
}]
diff --git a/build/android/gtest_filter/base_unittests_disabled b/build/android/gtest_filter/base_unittests_disabled
index 9ef1795..2d04b9c 100644
--- a/build/android/gtest_filter/base_unittests_disabled
+++ b/build/android/gtest_filter/base_unittests_disabled
@@ -19,4 +19,3 @@ FileUtilProxyTest.Touch
# New failures on APK
MessagePumpLibeventTest.DeleteWatcher
MessagePumpLibeventTest.StopWatcher
-SharedMemoryProcessTest.Tasks
diff --git a/build/android/gtest_filter/content_unittests_disabled b/build/android/gtest_filter/content_unittests_disabled
index 17d7e71..b41aee4 100644
--- a/build/android/gtest_filter/content_unittests_disabled
+++ b/build/android/gtest_filter/content_unittests_disabled
@@ -41,3 +41,5 @@ GPUTestExpectationsParserTest.WebGLTestExpectationsValidation
# crbug.com/104950
DeviceOrientationProviderTest.ObserverNotRemoved
DeviceOrientationProviderTest.StartFailing
+# Test failures on APK
+ChromeAppCacheServiceTest.*
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index 8951799..76ca4f9 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -79,6 +79,9 @@ _TEST_SUITES = ['base_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):