diff options
Diffstat (limited to 'utils/lit')
| -rw-r--r-- | utils/lit/lit/TestRunner.py | 25 | ||||
| -rw-r--r-- | utils/lit/lit/TestingConfig.py | 8 |
2 files changed, 30 insertions, 3 deletions
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index 20fbc6c..148beba 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -385,7 +385,30 @@ def parseIntegratedTestScript(test): script = [] xfails = [] xtargets = [] + ignoredAny = False for ln in open(sourcepath): + if 'IF(' in ln: + # Required syntax here is IF(condition(value)): + index = ln.index('IF(') + ln = ln[index+3:] + index = ln.index('(') + if index is -1: + return (Test.UNRESOLVED, "ill-formed IF at '"+ln[:10]+"'") + condition = ln[:index] + ln = ln[index+1:] + index = ln.index(')') + if index is -1 or ln[index:index+3] != ')):': + return (Test.UNRESOLVED, "ill-formed IF at '"+ln[:10]+"'") + value = ln[:index] + ln = ln[index+3:] + + # Actually test the condition. + if condition not in test.config.conditions: + return (Test.UNRESOLVED, "unknown condition '"+condition+"'") + if not test.config.conditions[condition](value): + ignoredAny = True + continue + if 'RUN:' in ln: # Isolate the command to run. index = ln.index('RUN:') @@ -422,6 +445,8 @@ def parseIntegratedTestScript(test): # Verify the script contains a run line. if not script: + if ignoredAny: + return (Test.UNSUPPORTED, "Test has only ignored run lines") return (Test.UNRESOLVED, "Test has no run line!") if script[-1][-1] == '\\': diff --git a/utils/lit/lit/TestingConfig.py b/utils/lit/lit/TestingConfig.py index 1f5067c..b1302ff 100644 --- a/utils/lit/lit/TestingConfig.py +++ b/utils/lit/lit/TestingConfig.py @@ -27,7 +27,8 @@ class TestingConfig: on_clone = None, test_exec_root = None, test_source_root = None, - excludes = []) + excludes = [], + conditions = {}) if os.path.exists(path): # FIXME: Improve detection and error reporting of errors in the @@ -53,7 +54,7 @@ class TestingConfig: def __init__(self, parent, name, suffixes, test_format, environment, substitutions, unsupported, on_clone, - test_exec_root, test_source_root, excludes): + test_exec_root, test_source_root, excludes, conditions): self.parent = parent self.name = str(name) self.suffixes = set(suffixes) @@ -65,6 +66,7 @@ class TestingConfig: self.test_exec_root = test_exec_root self.test_source_root = test_source_root self.excludes = set(excludes) + self.conditions = dict(conditions) def clone(self, path): # FIXME: Chain implementations? @@ -74,7 +76,7 @@ class TestingConfig: self.environment, self.substitutions, self.unsupported, self.on_clone, self.test_exec_root, self.test_source_root, - self.excludes) + self.excludes, self.conditions) if cfg.on_clone: cfg.on_clone(self, cfg, path) return cfg |