Use log- prefix for filtered log arg so that buildbot picks it up and uploads as an artefact

This commit is contained in:
Manish Goregaokar 2016-11-28 14:28:30 -08:00
parent c0c65ea637
commit f42ce6de92
2 changed files with 8 additions and 8 deletions

View file

@ -2,7 +2,7 @@ mac-rel-wpt1:
- ./mach build --release - ./mach build --release
- ./mach test-wpt-failure - ./mach test-wpt-failure
- ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed - ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
- ./mach filter-intermittents wpt-errorsummary.log --output filtered-wpt-errorsummary.log --use-tracker - ./mach filter-intermittents wpt-errorsummary.log --log-filteredsummary filtered-wpt-errorsummary.log --use-tracker
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 8 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource - ./mach test-wpt --release --binary-arg=--multiprocess --processes 8 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
- ./mach build-cef --release - ./mach build-cef --release
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh
@ -11,7 +11,7 @@ mac-rel-wpt1:
mac-rel-wpt2: mac-rel-wpt2:
- ./mach build --release - ./mach build --release
- ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed - ./mach test-wpt --release --processes 8 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
- ./mach filter-intermittents wpt-errorsummary.log --output filtered-wpt-errorsummary.log --use-tracker - ./mach filter-intermittents wpt-errorsummary.log --log-filteredsummary filtered-wpt-errorsummary.log --use-tracker
mac-dev-unit: mac-dev-unit:
- ./mach build --dev - ./mach build --dev
@ -24,7 +24,7 @@ mac-dev-unit:
mac-rel-css: mac-rel-css:
- ./mach build --release - ./mach build --release
- ./mach test-css --release --processes 4 --log-raw test-css.log --log-errorsummary css-errorsummary.log --always-succeed - ./mach test-css --release --processes 4 --log-raw test-css.log --log-errorsummary css-errorsummary.log --always-succeed
- ./mach filter-intermittents css-errorsummary.log --output filtered-css-errorsummary.log --use-tracker - ./mach filter-intermittents css-errorsummary.log --log-filteredsummary filtered-css-errorsummary.log --use-tracker
- ./mach build-geckolib --release - ./mach build-geckolib --release
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh
- bash ./etc/ci/manifest_changed.sh - bash ./etc/ci/manifest_changed.sh
@ -61,13 +61,13 @@ linux-rel-wpt:
- ./mach build --release --with-debug-assertions - ./mach build --release --with-debug-assertions
- ./mach test-wpt-failure - ./mach test-wpt-failure
- ./mach test-wpt --release --processes 24 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed - ./mach test-wpt --release --processes 24 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
- ./mach filter-intermittents wpt-errorsummary.log --output filtered-wpt-errorsummary.log --use-tracker - ./mach filter-intermittents wpt-errorsummary.log --log-filteredsummary filtered-wpt-errorsummary.log --use-tracker
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
linux-rel-css: linux-rel-css:
- ./mach build --release --with-debug-assertions - ./mach build --release --with-debug-assertions
- ./mach test-css --release --processes 16 --log-raw test-css.log --log-errorsummary css-errorsummary.log --always-succeed - ./mach test-css --release --processes 16 --log-raw test-css.log --log-errorsummary css-errorsummary.log --always-succeed
- ./mach filter-intermittents css-errorsummary.log --output filtered-css-errorsummary.log --use-tracker - ./mach filter-intermittents css-errorsummary.log --log-filteredsummary filtered-css-errorsummary.log --use-tracker
- ./mach build-cef --release --with-debug-assertions - ./mach build-cef --release --with-debug-assertions
- ./mach build-geckolib --release - ./mach build-geckolib --release
- ./mach test-stylo --release - ./mach test-stylo --release

View file

@ -484,13 +484,13 @@ class MachCommands(CommandBase):
category='testing') category='testing')
@CommandArgument('summary', @CommandArgument('summary',
help="Error summary log to take un") help="Error summary log to take un")
@CommandArgument('--output', default=None, @CommandArgument('--log-filteredsummary', default=None,
help='Print filtered log to file') help='Print filtered log to file')
@CommandArgument('--auth', default=None, @CommandArgument('--auth', default=None,
help='File containing basic authorization credentials for Github API (format `username:password`)') help='File containing basic authorization credentials for Github API (format `username:password`)')
@CommandArgument('--use-tracker', default=False, action='store_true', @CommandArgument('--use-tracker', default=False, action='store_true',
help='Use https://www.joshmatthews.net/intermittent-tracker') help='Use https://www.joshmatthews.net/intermittent-tracker')
def filter_intermittents(self, summary, output, auth, use_tracker): def filter_intermittents(self, summary, log_filteredsummary, auth, use_tracker):
encoded_auth = None encoded_auth = None
if auth: if auth:
with open(auth, "r") as file: with open(auth, "r") as file:
@ -525,7 +525,7 @@ class MachCommands(CommandBase):
if len(actual_failures) == 0: if len(actual_failures) == 0:
return 0 return 0
output = open(output, "w") if output else sys.stdout output = open(log_filteredsummary, "w") if log_filteredsummary else sys.stdout
for failure in actual_failures: for failure in actual_failures:
json.dump(failure, output) json.dump(failure, output)
print("\n", end='', file=output) print("\n", end='', file=output)