Merge pull request #1078 from dklempner/run_tests_timeout

Unconditionally add a newline if a test times out or fails.
pull/1069/head
Vijay Pai 10 years ago
commit 6fba6e1f6b
  1. 4
      tools/run_tests/jobset.py

@ -192,7 +192,7 @@ class Job(object):
self._tempfile.seek(0) self._tempfile.seek(0)
stdout = self._tempfile.read() stdout = self._tempfile.read()
message('FAILED', '%s [ret=%d]' % ( message('FAILED', '%s [ret=%d]' % (
self._spec.shortname, self._process.returncode), stdout) self._spec.shortname, self._process.returncode), stdout, do_newline=True)
else: else:
self._state = _SUCCESS self._state = _SUCCESS
message('PASSED', '%s [time=%.1fsec]' % (self._spec.shortname, elapsed), message('PASSED', '%s [time=%.1fsec]' % (self._spec.shortname, elapsed),
@ -200,7 +200,7 @@ class Job(object):
if self._bin_hash: if self._bin_hash:
update_cache.finished(self._spec.identity(), self._bin_hash) update_cache.finished(self._spec.identity(), self._bin_hash)
elif self._state == _RUNNING and time.time() - self._start > 300: elif self._state == _RUNNING and time.time() - self._start > 300:
message('TIMEOUT', self._spec.shortname, do_newline=self._travis) message('TIMEOUT', self._spec.shortname, do_newline=True)
self.kill() self.kill()
return self._state return self._state

Loading…
Cancel
Save