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
This commit is contained in:
Reid Spencer 2007-04-11 20:57:39 +00:00
parent 5059815af5
commit 6650bbc30b
2 changed files with 21 additions and 21 deletions

View File

@ -59,10 +59,14 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
@echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
@echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp
@echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
@echo 'set gccpath "$(CC)"' >>site.tmp
@echo 'set gxxpath "$(CXX)"' >>site.tmp
@echo 'set compile_c {$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c } ' >>site.tmp
@echo 'set compile_cxx {$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c}' >> site.tmp
@echo 'set link {$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)}' >>site.tmp
@echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
@echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
@echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
@echo 'set gxxcmd "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts)"' >> site.tmp
@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
@test ! -f site.exp || \
sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp

View File

@ -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