[llvm-commits] CVS: llvm/test/lib/llvm-dg.exp

[Tanya Brethour]

Changes in directory llvm/test/lib:

llvm-dg.exp updated: 1.1 -> 1.2
---
Log message:

With the changes to these files, the Regression test suite should be tested by dejagnu without anyproblem.
Some variables could be made global.


---
Diffs of the changes:  (+13 -3)

Index: llvm/test/lib/llvm-dg.exp
diff -u llvm/test/lib/llvm-dg.exp:1.1 llvm/test/lib/llvm-dg.exp:1.2
--- llvm/test/lib/llvm-dg.exp:1.1	Sat Nov  6 15:07:41 2004
+++ llvm/test/lib/llvm-dg.exp	Sat Nov  6 23:02:56 2004
@@ -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 @@
 
 		#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