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
cbchan · May 30, 2012 · 26d35e5 · 26d35e5
1 parent c2d58b4
commit 26d35e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -79,6 +79,9 @@
 # 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):