diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 22:55:28 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 22:55:28 +0000 |
| commit | ddd27017e539e99fa4003f9adde0802a472672f3 (patch) | |
| tree | 0d2292fe952460cd35f4dcdeb886424c70ef67b6 /build | |
| parent | 6e692dc77bfeb771647a21199b6e6f54de0a102b (diff) | |
| download | chromium_src-ddd27017e539e99fa4003f9adde0802a472672f3.zip chromium_src-ddd27017e539e99fa4003f9adde0802a472672f3.tar.gz chromium_src-ddd27017e539e99fa4003f9adde0802a472672f3.tar.bz2 | |
Revert of Run android tests through runtest.py. (https://codereview.chromium.org/410033002/)
Reason for revert:
Broke a ton of tests:
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/14823
Original issue's description:
> Run android tests through runtest.py.
>
> BUG=329102
> R=qyearsley@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285667
TBR=qyearsley@chromium.org,jbudorick@chromium.org,klundberg@chromium.org,navabi@chromium.org,yfriedman@chromium.org,eseidel@chromium.org,zty@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=329102
Review URL: https://codereview.chromium.org/423593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 2bd9567..0516052 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -96,29 +96,6 @@ def _GetRevision(options): return revision -def _RunTest(options, cmd, suite): - """Run test command with runtest.py. - - Args: - options: options object. - cmd: the command to run. - suite: test name. - """ - property_args = bb_utils.EncodeProperties(options) - args = [os.path.join(SLAVE_SCRIPTS_DIR, 'runtest.py'), - '--test-type', - suite, - '--run-python-script' - ] + property_args - if options.factory_properties.get('generate_gtest_json'): - args.append('--generate-json-file') - - if options.target == 'Release': - args += ['--target', 'Release'] - args += cmd - RunCmd(args) - - def RunTestSuites(options, suites, suites_options=None): """Manages an invocation of test_runner.py for gtests. @@ -148,7 +125,7 @@ def RunTestSuites(options, suites, suites_options=None): cmd += suites_options.get(suite, []) if suite == 'content_browsertests': cmd.append('--num_retries=1') - _RunTest(options, cmd, suite) + RunCmd(cmd) def RunChromeDriverTests(options): |