diff options
| -rw-r--r-- | utils/lit/lit/TestRunner.py | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index 6688029..268e46c 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -489,19 +489,8 @@ def parseIntegratedTestScript(test, normalize_slashes=False, return script,tmpBase,execdir -def executeShTest(test, litConfig, useExternalSh, - extra_substitutions=[]): - if test.config.unsupported: - return (Test.UNSUPPORTED, 'Test is unsupported') - - res = parseIntegratedTestScript(test, useExternalSh, extra_substitutions) - if isinstance(res, lit.Test.Result): - return res - if litConfig.noExecute: - return lit.Test.Result(Test.PASS) - - script, tmpBase, execdir = res - +def _runShTest(test, litConfig, useExternalSh, + script, tmpBase, execdir): # Create the output directory if it does not already exist. lit.util.mkdir_p(os.path.dirname(tmpBase)) @@ -529,3 +518,19 @@ def executeShTest(test, litConfig, useExternalSh, output += """Command Output (stderr):\n--\n%s\n--\n""" % (err,) return lit.Test.Result(status, output) + + +def executeShTest(test, litConfig, useExternalSh, + extra_substitutions=[]): + if test.config.unsupported: + return (Test.UNSUPPORTED, 'Test is unsupported') + + res = parseIntegratedTestScript(test, useExternalSh, extra_substitutions) + if isinstance(res, lit.Test.Result): + return res + if litConfig.noExecute: + return lit.Test.Result(Test.PASS) + + script, tmpBase, execdir = res + return _runShTest(test, litConfig, useExternalSh, script, tmpBase, execdir) + |