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

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index a8eec3a4965b6fbb48fb8017d1317e5d3d73d979..f5ec6f339ea963e853458fd2bcbbf5e46c100a34 100644 (file)
--- 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 3e4b2c6cebe31248ff23b28a25326d7c299756a1..6ed3ce609ed7e8428687c5dfc1af91cb3f5857de 100644 (file)
--- 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.