author | Henrik Skupin <mail@hskupin.info> |
Wed, 24 Apr 2019 09:30:41 +0000 | |
changeset 470739 | 6f64c339a2a8f08693ff62512d6f730b2425dc1d |
parent 470738 | 92e638c435da77351cd0d9900d9e0d9bf85a610f |
child 470740 | ec3fe3df0985e35f654dbf5854a19fce8b79fe44 |
push id | 83949 |
push user | hskupin@mozilla.com |
push date | Wed, 24 Apr 2019 19:43:28 +0000 |
treeherder | autoland@b2677f62c9d0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gbrown |
bugs | 1506928 |
milestone | 68.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/testing/mozharness/mozharness/base/script.py +++ b/testing/mozharness/mozharness/base/script.py @@ -1451,16 +1451,24 @@ class ScriptMixin(PlatformMixin): """Avoid losing the final lines of the log?""" loop = False while True: line = p.stdout.readline() if not line: break parser.add_lines(line) returncode = p.returncode + except KeyboardInterrupt: + level = error_level + if halt_on_failure: + level = FATAL + self.log("Process interrupted by the user, killing process with pid %s" % p.pid, + level=level) + p.kill() + return -1 except OSError, e: level = error_level if halt_on_failure: level = FATAL self.log('caught OS error %s: %s while running %s' % (e.errno, e.strerror, command), level=level) return -1