summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-08 23:38:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-08 23:38:59 +0000
commit51f06ecc5d0f71448146f98905b1796ae88d28da (patch)
tree4b121bcd0873e89d3d260433e97e0d405f5d5e6b
parentf41cd32af0994358ae9f3acca23c0354de5b3f0d (diff)
parent943bdc2fd8f42882b239922a2feeabe5e5f9c83b (diff)
downloadexternal_llvm-51f06ecc5d0f71448146f98905b1796ae88d28da.zip
external_llvm-51f06ecc5d0f71448146f98905b1796ae88d28da.tar.gz
external_llvm-51f06ecc5d0f71448146f98905b1796ae88d28da.tar.bz2
Merge "Split executeShTest into two parts so that it can be better leveraged by libc++"
-rw-r--r--utils/lit/lit/TestRunner.py31
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)
+