summaryrefslogtreecommitdiffstats
path: root/llvm/test/lib
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-04-11 20:57:39 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-04-11 20:57:39 +0000
commit641527f3e22f37ab980dd02d42a0f680c4e84e0d (patch)
tree08048db3194efc416d9db7ce67194045af0baf54 /llvm/test/lib
parent8e25101211a48c98097d2e4d59f5ac86c9d106c6 (diff)
downloadbcm5719-llvm-641527f3e22f37ab980dd02d42a0f680c4e84e0d.tar.gz
bcm5719-llvm-641527f3e22f37ab980dd02d42a0f680c4e84e0d.zip
Make new variables available: compile_c, compile_cxx, link to handle tests
that want to use LLVM's notion of compiling and linking programs. This includes all the -I -L and optimization switches that LLVM would using to compile or link any of this files. llvm-svn: 35920
Diffstat (limited to 'llvm/test/lib')
-rw-r--r--llvm/test/lib/llvm-dg.exp36
1 files changed, 16 insertions, 20 deletions
diff --git a/llvm/test/lib/llvm-dg.exp b/llvm/test/lib/llvm-dg.exp
index 593108af4a5..4d04713bceb 100644
--- a/llvm/test/lib/llvm-dg.exp
+++ b/llvm/test/lib/llvm-dg.exp
@@ -1,6 +1,7 @@
proc llvm-runtest { programs } {
- global objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext
- global llvmgcc_version srcroot objroot llvmlibsdir
+ global srcroot objroot srcdir objdir subdir target_triplet prcontext
+ global llvmgcc llvmgxx global llvmgcc_version llvmgccmajvers
+ global gccpath gxxpath compile_c compile_cxx link
set timeout 60
@@ -46,30 +47,25 @@ proc llvm-runtest { programs } {
set runline
set hasRunline 1
- #replace %s with filename
- regsub -all {%s} $runline $test new_runline
-
- #replace %t with temp filenames
- regsub -all {%t} $new_runline [file join Output $tmpFile] new_runline
-
+ set new_runline $runline
#replace %prcontext with prcontext.tcl (Must replace before %p)
regsub -all {%prcontext} $new_runline $prcontext new_runline
-
- #replace %p with path to source,
- regsub -all {%p} $new_runline [file join $srcdir $subdir] new_runline
-
#replace %llvmgcc with actual path to llvmgcc
regsub -all {%llvmgcc} $new_runline "$llvmgcc -emit-llvm" new_runline
-
#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
-
+ #replace %compile_c with C compilation command
+ regsub -all {%compile_c} $new_runline "$compile_c" new_runline
+ #replace %compile_cxx with C++ compilation command
+ regsub -all {%compile_cxx} $new_runline "$compile_cxx" new_runline
+ #replace %link with C++ link command
+ regsub -all {%link} $new_runline "$link" new_runline
+ #replace %p with path to source,
+ regsub -all {%p} $new_runline [file join $srcdir $subdir] new_runline
+ #replace %s with filename
+ regsub -all {%s} $new_runline $test new_runline
+ #replace %t with temp filenames
+ regsub -all {%t} $new_runline [file join Output $tmpFile] new_runline
puts $scriptFileId $new_runline
} elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
set targets
OpenPOWER on IntegriCloud