With the changes to these files, the Regression test suite should be tested by dejagn...

Some variables could be made global.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17557 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index a90477073fcb1f4d5a95743efc7184b716e1b184..77722c72af7b079bbc52bf9a6f09e860adc73288 100644 (file)
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -1,4 +1,4 @@
-proc llvm-runtest { programs srcdir subdir target_triplet} {
+proc llvm-runtest { programs srcdir subdir target_triplet llvmgcc llvmgxx prcontext} {
 
     set path [file join $srcdir $subdir]
     
@@ -37,9 +37,19 @@ proc llvm-runtest { programs srcdir subdir target_triplet} {
 
                #replace %s with filename
                regsub -all {%s} $runline $filename new_runline
-               
+
+               #replace %t with temp filenames
                regsub -all {%t} $new_runline [file join Output $tmpFile] new_runline
-       
+
+               #replace %llvmgcc with actual path to llvmgcc
+               regsub -all {%llvmgcc} $new_runline $llvmgcc new_runline
+
+               #replace %llvmgxx with actual path to llvmg++
+               regsub -all {%llvmgxx} $new_runline $llvmgxx new_runline
+               
+               #replace %prcontext with actual path to llvmg++ (Goes away when we remove qmtest)
+               regsub -all {%prcontext} $new_runline "python $prcontext" new_runline
+
                puts $scriptFileId $new_runline
            } elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
                set targets