Run base_unittests_apk on the test try bot for realz.

This will make the android_test bot red when apk tests fail.

The ANDROID_APK_TEST_TARGET flag is required while we transition from executable to APK tests.
 - Executable tests need the DIR_CACHE override as the default path comes from the java side.

BUG=125059

Review URL: https://chromiumcodereview.appspot.com/10332230

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138407 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 18 deletions

diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 1db548e..907bb15d 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -232,13 +232,5 @@ function bb_run_tests {
 # Run APK tests on an actual device.
 function bb_run_apk_tests {
   echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
-  tempfile=/tmp/tempfile-$$.txt
-  # Filter out STEP_FAILURES, we don't want REDNESS on test failures for now.
-  build/android/run_tests.py --xvfb --verbose --apk=True \
-    | sed 's/@@@STEP_FAILURE@@@//g' | tee $tempfile
-  happy_failure=$(cat $tempfile | grep RUNNER_FAILED | wc -l)
-  if [[ $happy_failure -eq 0 ]] ; then
-    echo "@@@STEP_WARNINGS@@@"
-  fi
-  rm -f $tempfile
+  build/android/run_tests.py --xvfb --verbose --apk=True
 }
diff --git a/build/android/gtest_filter/base_unittests_disabled b/build/android/gtest_filter/base_unittests_disabled
index e45a9fd..9ef1795 100644
--- a/build/android/gtest_filter/base_unittests_disabled
+++ b/build/android/gtest_filter/base_unittests_disabled
@@ -1,13 +1,10 @@
 # List of suppressions
 #
 # Sometimes this is automatically generated by run_tests.py
-RTLTest.GetTextDirection
 ReadOnlyFileUtilTest.ContentsEqual
 ReadOnlyFileUtilTest.TextContentsEqual
 SharedMemoryTest.OpenExclusive
-StackTrace.DebugPrintBacktrace
 VerifyPathControlledByUserTest.Symlinks
-PathServiceTest.Get
 SharedMemoryTest.OpenClose
 StringPrintfTest.StringPrintfMisc
 StringPrintfTest.StringAppendfString
@@ -19,3 +16,7 @@ FieldTrialTest.*
 StackContainer.BufferAlignment
 # Failed on bot since it was first introduced.
 FileUtilProxyTest.Touch
+# New failures on APK
+MessagePumpLibeventTest.DeleteWatcher
+MessagePumpLibeventTest.StopWatcher
+SharedMemoryProcessTest.Tasks
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index f059a24..30e2c4d 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -76,12 +76,9 @@ _TEST_SUITES = ['base_unittests',
                 'ui_unittests',
                ]
 
-# Test suites which are build as an APK. This will be replaced by the default
+# 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 = ['replaceme',  # Test the template apk too.
-                    'base_unittests',
-                    'ipc_tests',
-                    'ui_unittests',
+_APK_TEST_SUITES = ['base_unittests',
                    ]
 
 def FullyQualifiedTestSuites(apk):
diff --git a/build/common.gypi b/build/common.gypi
index 73a7202..0bc48a5 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -901,7 +901,7 @@
         'notifications%': 0,
 
         'gtest_target_type%': '<(gtest_target_type)',
-        # TODO(jrg): when 'gtest_target_type'=='shared_libary' and
+        # TODO(jrg): when 'gtest_target_type'=='shared_library' and
         # OS==android, make all gtest_targets depend on
         # testing/android/native_test.gyp:native_test_apk.
         ### 'gtest_target_type': 'shared_libary',
@@ -1349,6 +1349,9 @@
       ['enable_metro==1', {
         'defines': ['ENABLE_METRO=1'],
       }],
+      ['OS=="android" and gtest_target_type=="shared_library"', {
+        'defines': ['ANDROID_APK_TEST_TARGET=1'],
+      }],
       ['fastbuild!=0', {
 
         'conditions': [