diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 04:43:13 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 04:43:13 +0000 |
| commit | be2dc63376188df3308a95c01471b414d13e81bc (patch) | |
| tree | 957688c60732bd87e67a325444bc40261046307c | |
| parent | 406105e18a94fc6227b1cf5fc927290ee082174b (diff) | |
| download | chromium_src-be2dc63376188df3308a95c01471b414d13e81bc.zip chromium_src-be2dc63376188df3308a95c01471b414d13e81bc.tar.gz chromium_src-be2dc63376188df3308a95c01471b414d13e81bc.tar.bz2 | |
GTTF: Pass a flag for JSON machine-readable output in nacl buildbot scripts.
This depends on https://codereview.chromium.org/85923004/
BUG=317931
Review URL: https://codereview.chromium.org/85373005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237512 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py index cf0922a..1155b79 100755 --- a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py +++ b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py @@ -216,6 +216,14 @@ def BuildAndTest(options): cmd.append('disable_flaky_tests=1') cmd.append('chrome_browser_tests') + # Propagate path to JSON output if present. + # Note that RunCommand calls sys.exit on errors, so potential errors + # from one command won't be overwritten by another one. Overwriting + # a successful results file with either success or failure is fine. + if options.json_build_results_output_file: + cmd.append('json_build_results_output_file=%s' % + options.json_build_results_output_file) + # Download the toolchain(s). RunCommand([python, os.path.join(nacl_dir, 'build', 'download_toolchains.py'), @@ -243,6 +251,9 @@ def MakeCommandLineParser(): parser.add_option('--enable_glibc', dest='enable_glibc', default=-1, type='int', help='Run glibc tests?') + parser.add_option('--json_build_results_output_file', + help='Path to a JSON file for machine-readable output.') + # Deprecated, but passed to us by a script in the Chrome repo. # Replaced by --enable_glibc=0 parser.add_option('--disable_glibc', dest='disable_glibc', |