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

tools/should.py: update from upstream

should@28eaf5a6
see #3762
parent c5533e59
...@@ -57,6 +57,7 @@ RE_TEST = re.compile('^(\S)*[:]') ...@@ -57,6 +57,7 @@ RE_TEST = re.compile('^(\S)*[:]')
DIRECTIVE_REQUIRES = '!REQUIRES:' DIRECTIVE_REQUIRES = '!REQUIRES:'
DIRECTIVE_NO_LAUNCHER = '!NO_LAUNCHER:' DIRECTIVE_NO_LAUNCHER = '!NO_LAUNCHER:'
DIRECTIVE_SCRIPT = '!LAUNCH:' DIRECTIVE_SCRIPT = '!LAUNCH:'
DIRECTIVE_NO_EXTRA = '!NO_EXTRA:'
DIRECTIVE_OPTIONS = '!OPTIONS:' DIRECTIVE_OPTIONS = '!OPTIONS:'
DIRECTIVE_SOURCE = '!OUTPUT_FILE:' DIRECTIVE_SOURCE = '!OUTPUT_FILE:'
DIRECTIVE_EXIT_CODE = '!EXIT_CODE:' DIRECTIVE_EXIT_CODE = '!EXIT_CODE:'
...@@ -676,6 +677,11 @@ class TestSuite(): ...@@ -676,6 +677,11 @@ class TestSuite():
self.use_launcher = False self.use_launcher = False
continue continue
# Directive -- No extra options
if l.startswith(DIRECTIVE_NO_EXTRA):
self.variables = [(VAR_EXTRA, '')] + self.variables
continue
# Directive -- Source # Directive -- Source
if l.startswith(DIRECTIVE_SOURCE): if l.startswith(DIRECTIVE_SOURCE):
self.source = os.path.join(self.cd if self.cd else '', l[len(DIRECTIVE_SOURCE):].strip()) self.source = os.path.join(self.cd if self.cd else '', l[len(DIRECTIVE_SOURCE):].strip())
......
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