summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authorcraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 19:46:02 +0000
committercraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 19:46:02 +0000
commiteb9f5a30d346bf2f490647b64f7bfccda1516225 (patch)
tree2b2af32fee6124085e75abf780617634b061908b /build/android
parent3f6007ab1f6075c31dc23b5ded198f22a3d08bae (diff)
downloadchromium_src-eb9f5a30d346bf2f490647b64f7bfccda1516225.zip
chromium_src-eb9f5a30d346bf2f490647b64f7bfccda1516225.tar.gz
chromium_src-eb9f5a30d346bf2f490647b64f7bfccda1516225.tar.bz2
[chromedriver] Run tests on stable and beta channel chrome.
BUG=274681 TEST=Ran locally Review URL: https://chromiumcodereview.appspot.com/23125011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py5
-rw-r--r--build/android/pylib/constants.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 260ec76..a29e2a1 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -124,7 +124,10 @@ def RunChromeDriverTests(_):
"""Run all the steps for running chromedriver tests."""
bb_annotations.PrintNamedStep('chromedriver_annotation')
RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
- '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE])
+ '--android-packages=%s,%s,%s' %
+ (constants.CHROMIUM_TEST_SHELL_PACKAGE,
+ constants.CHROME_STABLE_PACKAGE,
+ constants.CHROME_BETA_PACKAGE)])
def InstallApk(options, test, print_step=False):
"""Install an apk to all phones.
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index b519282..732c937 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -18,6 +18,9 @@ CHROME_PACKAGE = 'com.google.android.apps.chrome'
CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'
CHROME_DEVTOOLS_SOCKET = 'chrome_devtools_remote'
+CHROME_STABLE_PACKAGE = 'com.android.chrome'
+CHROME_BETA_PACKAGE = 'com.chrome.beta'
+
CHROME_TESTS_PACKAGE = 'com.google.android.apps.chrome.tests'
LEGACY_BROWSER_PACKAGE = 'com.google.android.browser'