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

[Reid Spencer]

Changes in directory llvm/test/lib:

llvm-dg.exp updated: 1.14 -> 1.15
---
Log message:

Make the llvm-runtest function much more amenable by eliminating all the
global variables that needed to be passed in. This makes it possible to 
add new global variables with only a couple changes (Makefile and llvm-dg.exp)
instead of touching every single dg.exp file.


---
Diffs of the changes:  (+9 -4)

 llvm-dg.exp |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


Index: llvm/test/lib/llvm-dg.exp
diff -u llvm/test/lib/llvm-dg.exp:1.14 llvm/test/lib/llvm-dg.exp:1.15
--- llvm/test/lib/llvm-dg.exp:1.14	Thu May 18 14:42:16 2006
+++ llvm/test/lib/llvm-dg.exp	Wed Apr 11 14:56:59 2007
@@ -1,5 +1,6 @@
-proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext llvmgcc_version} {
-
+proc llvm-runtest { programs } { 
+    global objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext
+    global llvmgcc_version srcroot objroot llvmlibsdir
 
     set timeout 60
 
@@ -63,6 +64,12 @@
 		#replace %llvmgxx with actual path to llvmg++
 		regsub -all {%llvmgxx} $new_runline "$llvmgxx -emit-llvm" new_runline
 		
+		#replace %L with path to libraries
+		regsub -all {%L} $new_runline "$llvmlibsdir" new_runline
+
+		#replace %I with path to includes
+		regsub -all {%I} $new_runline "$srcroot/include" new_runline
+
 		puts $scriptFileId $new_runline
 	    } elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
 		set targets
@@ -127,5 +134,3 @@
 	}
     }
 }
-
-