diff options
| -rw-r--r-- | test/lit.cfg | 4 | ||||
| -rw-r--r-- | utils/lit/lit/TestingConfig.py | 19 |
2 files changed, 9 insertions, 14 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index dc08c679ca..8828e06f3e 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -39,8 +39,8 @@ config.test_format = lit.formats.ShTest(execute_external) # To ignore test output on stderr so it doesn't trigger failures uncomment this: #config.test_format = lit.formats.TclTest(ignoreStdErr=True) -# suffixes: A list of file extensions to treat as test files, this is actually -# set by on_clone(). +# suffixes: A list of file extensions to treat as test files. This is overriden +# by individual lit.local.cfg files in the test subdirectories. config.suffixes = [] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' diff --git a/utils/lit/lit/TestingConfig.py b/utils/lit/lit/TestingConfig.py index 925099ca5d..d4d218b570 100644 --- a/utils/lit/lit/TestingConfig.py +++ b/utils/lit/lit/TestingConfig.py @@ -45,7 +45,6 @@ class TestingConfig: environment = environment, substitutions = [], unsupported = False, - on_clone = None, test_exec_root = None, test_source_root = None, excludes = [], @@ -90,7 +89,7 @@ class TestingConfig: return config def __init__(self, parent, name, suffixes, test_format, - environment, substitutions, unsupported, on_clone, + environment, substitutions, unsupported, test_exec_root, test_source_root, excludes, available_features, pipefail): self.parent = parent @@ -100,7 +99,6 @@ class TestingConfig: self.environment = dict(environment) self.substitutions = list(substitutions) self.unsupported = unsupported - self.on_clone = on_clone self.test_exec_root = test_exec_root self.test_source_root = test_source_root self.excludes = set(excludes) @@ -111,15 +109,12 @@ class TestingConfig: # FIXME: Chain implementations? # # FIXME: Allow extra parameters? - cfg = TestingConfig(self, self.name, self.suffixes, self.test_format, - self.environment, self.substitutions, - self.unsupported, self.on_clone, - self.test_exec_root, self.test_source_root, - self.excludes, self.available_features, - self.pipefail) - if cfg.on_clone: - cfg.on_clone(self, cfg, path) - return cfg + return TestingConfig(self, self.name, self.suffixes, self.test_format, + self.environment, self.substitutions, + self.unsupported, + self.test_exec_root, self.test_source_root, + self.excludes, self.available_features, + self.pipefail) def finish(self, litConfig): """finish() - Finish this config object, after loading is complete.""" |