summaryrefslogtreecommitdiff
path: root/test/lib
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-04-11 19:56:59 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-04-11 19:56:59 +0000
commit0f5aed564871ecd3f55a54db82ed90e15b0a1233 (patch)
treece8b4ab128deef544b18c9f0fff1381ea786dd0e /test/lib
parent6b8a6b50d91d625c15497bd400a537e4526e0179 (diff)
downloadllvm-0f5aed564871ecd3f55a54db82ed90e15b0a1233.tar.gz
llvm-0f5aed564871ecd3f55a54db82ed90e15b0a1233.tar.bz2
llvm-0f5aed564871ecd3f55a54db82ed90e15b0a1233.tar.xz
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35918 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/llvm-dg.exp13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 07dffae29c..593108af4a 100644
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -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 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
#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 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
}
}
}
-
-