Android: Run content_browsertests on the experimental bot

BUG=138275


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

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

4 files changed, 19 insertions, 4 deletions

diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 3acc4c3..e33046e 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -137,6 +137,19 @@ def RunTestSuites(options, suites):
     buildbot_report.PrintNamedStep(suite)
     RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
+def RunBrowserTestSuite(options):
+  """Manages an invocation of run_browser_tests.py.
+
+  Args:
+    options: options object.
+  """
+  args = ['--verbose']
+  if options.target == 'Release':
+    args.append('--release')
+  if options.asan:
+    args.append('--tool=asan')
+  buildbot_report.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME)
+  RunCmd(['build/android/run_browser_tests.py'] + args)
 
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
@@ -258,6 +271,7 @@ def MainTestWrapper(options):
 
   if options.experimental:
     RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
+    RunBrowserTestSuite(options)
 
   # Print logcat, kill logcat monitor
   buildbot_report.PrintNamedStep('logcat_dump')
diff --git a/build/android/pylib/browsertests/dispatch.py b/build/android/pylib/browsertests/dispatch.py
index 95a7ffd..776fd1a 100644
--- a/build/android/pylib/browsertests/dispatch.py
+++ b/build/android/pylib/browsertests/dispatch.py
@@ -13,8 +13,6 @@ from pylib.base import shard
 from pylib.gtest import dispatch as gtest_dispatch
 from pylib.gtest import test_runner
 
-CONTENT_BROWSERTEST_SUITENAME = 'content_browsertests'
-
 
 def Dispatch(options):
   attached_devices = []
@@ -36,7 +34,7 @@ def Dispatch(options):
                                 options.build_type)
   options.test_suite = os.path.join(test_suite_dir,
                                     'apks',
-                                    CONTENT_BROWSERTEST_SUITENAME + '.apk')
+                                    constants.BROWSERTEST_SUITE_NAME + '.apk')
 
   options.test_arguments = '--single_process %s' % options.test_arguments
 
@@ -67,7 +65,7 @@ def Dispatch(options):
                                         all_tests, options.build_type)
   test_results.LogFull(
       test_type='Unit test',
-      test_package=CONTENT_BROWSERTEST_SUITENAME,
+      test_package=constants.BROWSERTEST_SUITE_NAME,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
   test_results.PrintAnnotation()
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index 441ecfe..7e001c9 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -35,6 +35,7 @@ GTEST_TEST_PACKAGE_NAME = 'org.chromium.native_test'
 GTEST_TEST_ACTIVITY_NAME = 'org.chromium.native_test.ChromeNativeTestActivity'
 GTEST_COMMAND_LINE_FILE = 'chrome-native-tests-command-line'
 
+BROWSERTEST_SUITE_NAME = 'content_browsertests'
 BROWSERTEST_TEST_PACKAGE_NAME = 'org.chromium.content_browsertests_apk'
 BROWSERTEST_TEST_ACTIVITY_NAME = (
     'org.chromium.content_browsertests_apk.ContentBrowserTestsActivity')
diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index b4c3aba..c40a219 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -12,6 +12,8 @@ MessagePortTest.Tests
 EncryptedMediaTest.InvalidKeySystem
 IndexedDBBrowserTest.NullKeyPathPersistence
 IndexedDBBrowserTest.VersionChangeCrashResilience
+IndexedDBBrowserTest.ValueSizeTest
+IndexedDBBrowserTest.ConnectionsClosedOnTabClose
 CrossPlatformAccessibilityBrowserTest.*
 GpuCrashTest.MANUAL_WebkitLoseContext
 DatabaseTest.*