Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 4d0c33a3 authored by Mathieu Giraud's avatar Mathieu Giraud

tools/should.py: update from upstream, fix !REQUIRES, !NO_LAUNCHER, and !OUTPUT_FILE

closes #4460
parent a6c302c5
......@@ -981,13 +981,29 @@ class TestSuite():
continue
# Launch the command
test_lines, exit_test = self.launch([current_cmd], verbose, colorize)
self.one_test(exit_test, test_lines, verbose, colorize)
if not self.skip:
test_lines, exit_test = self.launch([current_cmd], verbose, colorize)
self.one_test(exit_test, test_lines, verbose, colorize)
self.cmds.append(current_cmd)
if not self.source:
# Regular testing, stdout added to 'current_test_lines'
current_test_lines += test_lines
self.test_lines += test_lines
else:
# !OUTPUT_FILE:, the content of the file overrides 'current_test_lines'
try:
with open(self.source) as f:
current_test_lines = f.readlines()
except OSError:
msg = self.source + ' not found'
self.skip_set(msg)
exit_test.status = Sta(S_FAILED)
exit_test.info += ' - ' + msg
current_test_lines = []
self.cmds.append(current_cmd)
current_cmd = ''
current_test_lines += test_lines
self.test_lines += test_lines
# end of loop on should_lines
......@@ -1040,7 +1056,7 @@ class TestSuite():
if verbose > 0:
self.print_stderr(colorize)
return open(self.source).readlines() if self.source else self.stdout, exit_test
return self.stdout, exit_test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment