summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authorsivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 17:21:12 +0000
committersivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 17:21:12 +0000
commitbdd22ffbbcbd29d68c7e29e05fd14ce67d1777f6 (patch)
tree4f94304156c0953c44415b4efcc69d1b62b89357 /build/android
parentc6b7d72304db25338bb8bc18ab708307f6249cf4 (diff)
downloadchromium_src-bdd22ffbbcbd29d68c7e29e05fd14ce67d1777f6.zip
chromium_src-bdd22ffbbcbd29d68c7e29e05fd14ce67d1777f6.tar.gz
chromium_src-bdd22ffbbcbd29d68c7e29e05fd14ce67d1777f6.tar.bz2
[Android] Add option so that instrumentation tests need not flunk on failure.
BUG=249997 NOTRY=True Review URL: https://chromiumcodereview.appspot.com/19501002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 1329d1c..b1769ee 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -156,7 +156,7 @@ def InstallApk(options, test, print_step=False):
RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
-def RunInstrumentationSuite(options, test):
+def RunInstrumentationSuite(options, test, flunk_on_failure=True):
"""Manages an invocation of test_runner.py for instrumentation tests.
Args:
@@ -184,7 +184,8 @@ def RunInstrumentationSuite(options, test):
if test.extra_flags:
args.extend(test.extra_flags)
- RunCmd(['build/android/test_runner.py', 'instrumentation'] + args)
+ RunCmd(['build/android/test_runner.py', 'instrumentation'] + args,
+ flunk_on_failure=flunk_on_failure)
def RunWebkitLint(target):