aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-13 01:39:50 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-13 01:39:50 +0000
commit5110609ceb901f20e1d8b38530e09f9e9017386c (patch)
tree82e4e80a22a5f2910feb78006dad606fe4c98ae9
parent8a2b012ba75a63b1f7519dedb30ff97b23ec4be2 (diff)
downloadexternal_llvm-5110609ceb901f20e1d8b38530e09f9e9017386c.zip
external_llvm-5110609ceb901f20e1d8b38530e09f9e9017386c.tar.gz
external_llvm-5110609ceb901f20e1d8b38530e09f9e9017386c.tar.bz2
tests: Add a %abs_tmp substitution which is guaranteed to be a full path.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81662 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/lib/llvm.exp2
-rw-r--r--utils/lit/TestRunner.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index a8eec3a..f5ec6f3 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -85,6 +85,8 @@ proc substitute { line test tmpFile } {
regsub -all {%s} $new_line $test new_line
#replace %t with temp filenames
regsub -all {%t} $new_line $tmpFile new_line
+ #replace %abs_tmp with absolute temp filenames
+ regsub -all {%abs_tmp} $new_line [file join [pwd] $tmpFile] new_line
#replace _#MARKER#_ with %
regsub -all {_#MARKER#_} $new_line % new_line
diff --git a/utils/lit/TestRunner.py b/utils/lit/TestRunner.py
index 3e4b2c6..6ed3ce6 100644
--- a/utils/lit/TestRunner.py
+++ b/utils/lit/TestRunner.py
@@ -294,6 +294,8 @@ def parseIntegratedTestScript(test, xfailHasColon, requireAndAnd):
('%S', os.path.dirname(sourcepath)),
('%p', os.path.dirname(sourcepath)),
('%t', tmpBase + '.tmp'),
+ # FIXME: Remove this once we kill DejaGNU.
+ ('%abs_tmp', tmpBase + '.tmp'),
('#_MARKER_#', '%')])
# Collect the test lines from the script.