Skip to content
Snippets Groups Projects
Commit cf9e317e authored by Jan Tattermusch's avatar Jan Tattermusch Committed by GitHub
Browse files

Merge pull request #9027 from jtattermusch/run_tests_windows_output

Readable output from run_tests.py on windows
parents c2046472 9fe161c7
No related branches found
No related tags found
No related merge requests found
...@@ -139,16 +139,16 @@ def message(tag, msg, explanatory_text=None, do_newline=False): ...@@ -139,16 +139,16 @@ def message(tag, msg, explanatory_text=None, do_newline=False):
if explanatory_text: if explanatory_text:
print(explanatory_text) print(explanatory_text)
print('%s: %s' % (tag, msg)) print('%s: %s' % (tag, msg))
return else:
sys.stdout.write('%s%s%s\x1b[%d;%dm%s\x1b[0m: %s%s' % ( sys.stdout.write('%s%s%s\x1b[%d;%dm%s\x1b[0m: %s%s' % (
_BEGINNING_OF_LINE, _BEGINNING_OF_LINE,
_CLEAR_LINE, _CLEAR_LINE,
'\n%s' % explanatory_text if explanatory_text is not None else '', '\n%s' % explanatory_text if explanatory_text is not None else '',
_COLORS[_TAG_COLOR[tag]][1], _COLORS[_TAG_COLOR[tag]][1],
_COLORS[_TAG_COLOR[tag]][0], _COLORS[_TAG_COLOR[tag]][0],
tag, tag,
msg, msg,
'\n' if do_newline or explanatory_text is not None else '')) '\n' if do_newline or explanatory_text is not None else ''))
sys.stdout.flush() sys.stdout.flush()
except: except:
pass pass
...@@ -406,7 +406,7 @@ class Jobset(object): ...@@ -406,7 +406,7 @@ class Jobset(object):
self.resultset[job.GetSpec().shortname].append(job.result) self.resultset[job.GetSpec().shortname].append(job.result)
self._running.remove(job) self._running.remove(job)
if dead: return if dead: return
if (not self._travis): if not self._travis and platform_string() != 'windows':
rstr = '' if self._remaining is None else '%d queued, ' % self._remaining rstr = '' if self._remaining is None else '%d queued, ' % self._remaining
if self._remaining is not None and self._completed > 0: if self._remaining is not None and self._completed > 0:
now = time.time() now = time.time()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment