summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authornavabi@chromium.org <navabi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 18:39:18 +0000
committernavabi@chromium.org <navabi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 18:39:18 +0000
commita61af456eb0323e18d852b3945d4a01c04171e14 (patch)
tree7b6d2232887179d3a3dfe525224cc33788706844 /build
parent561cc0a6a18642203af93d023959267ca2cbf24d (diff)
downloadchromium_src-a61af456eb0323e18d852b3945d4a01c04171e14.zip
chromium_src-a61af456eb0323e18d852b3945d4a01c04171e14.tar.gz
chromium_src-a61af456eb0323e18d852b3945d4a01c04171e14.tar.bz2
Revert 194601 "Android: Enable content_browsertests by default."
> Android: Enable content_browsertests by default. > > BUG=138275 > > Review URL: https://codereview.chromium.org/13445005 TBR=nileshagrawal@chromium.org Review URL: https://codereview.chromium.org/15042004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index a1f1b7f..5fadfaa 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -146,7 +146,7 @@ def RunBrowserTestSuite(options):
Args:
options: options object.
"""
- args = ['--verbose', '--num_retries=1']
+ args = ['--verbose']
if options.target == 'Release':
args.append('--release')
if options.asan:
@@ -284,7 +284,6 @@ def MainTestWrapper(options):
RunChromeDriverTests()
if 'unit' in options.test_filter:
RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
- RunBrowserTestSuite(options)
if 'ui' in options.test_filter:
for test in INSTRUMENTATION_TESTS.itervalues():
RunInstrumentationSuite(options, test)
@@ -298,6 +297,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')