Chromium Code Reviews| Index: tools/bots/dartium_android.py |
| diff --git a/tools/bots/dartium_android.py b/tools/bots/dartium_android.py |
| index 138c7dce65b11a5152a04ad39f3fd57d4d984a5b..4431570b9b67e6d0878b4a4842c1349c67b3d527 100644 |
| --- a/tools/bots/dartium_android.py |
| +++ b/tools/bots/dartium_android.py |
| @@ -14,6 +14,7 @@ Dart and chromium tests on it. |
| import optparse |
| import os |
| import string |
| +import subprocess |
| import sys |
| import bot |
| @@ -38,7 +39,7 @@ def UploadSetACL(gsutil, local, remote): |
| gsutil.upload(local, remote) |
| gsutil.setGroupReadACL(remote, 'google.com') |
| gsutil.setContentType(remote, 'application/vnd.android.package-archive') |
| - |
| + |
| def UploadAPKs(options): |
| with bot.BuildStep('Upload apk'): |
| @@ -72,6 +73,13 @@ def UploadAPKs(options): |
| UploadSetACL(gsutil, local, remote) |
| print "Uploaded content shell, available from: %s" % content_shell_link |
| + |
| +def RunContentShellTests(options): |
| + with bot.BuildStep('ContentShell tests'): |
| + subprocess.call_checked([os.path.join(SCRIPT_DIR, 'run_android_tests.sh'), |
|
Bill Hesse
2014/05/28 14:05:52
check_call, not call_checked
done
|
| + os.path.join(options.build_products_dir, CS_LOCATION)]) |
| + |
| + |
| def main(): |
| if sys.platform != 'linux2': |
| print "This script was only tested on linux. Please run it on linux!" |
| @@ -85,6 +93,7 @@ def main(): |
| sys.exit(1) |
| UploadAPKs(options) |
| + RunContentShellTests(options) |
| sys.exit(0) |
| if __name__ == '__main__': |