RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-26 07:56:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a problem where dejagnu won't accept the value of global tcl variable

Browse Source 
"libdir" for some reason. Changing to llvmlibsdir instead fixes it.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28526 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-05-28 07:22:42 +00:00
parent 15d4059430
commit 492196c89f
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Feature/dg.exp
View File

@ -1,4 +1,3 @@
load_lib llvm-dg.exp load_lib llvm-dg.exp
llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version

4
test/Makefile
View File

@ -47,8 +47,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
@echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
@echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
@echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
@echo 'set tooldir "$(ToolDir)"' >>site.tmp @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
@echo 'set libdir "$(LibDir)"' >>site.tmp @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
@echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
@echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
@echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp

11
test/lib/llvm2cpp.exp
View File

@ -7,12 +7,12 @@
proc llvm2cpp-test { files } { proc llvm2cpp-test { files } {
# if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } { # if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } {
global subdir tooldir libdir objdir srcdir objroot srcroot global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot
set timeout 30 set timeout 30
set path [file join $objdir $subdir] set path [file join $objdir $subdir]
set llvm2cpp [file join $tooldir llvm2cpp ] set llvm2cpp [file join $llvmtoolsdir llvm2cpp ]
set llvmas [file join $tooldir llvm-as ] set llvmas [file join $llvmtoolsdir llvm-as ]
set llvmdis [file join $tooldir llvm-dis ] set llvmdis [file join $llvmtoolsdir llvm-dis ]
#Make Output Directory if it does not exist already #Make Output Directory if it does not exist already
if { [file exists path] } { if { [file exists path] } {
@ -49,8 +49,7 @@ proc llvm2cpp-test { files } {
} }
set retval [ catch { set retval [ catch {
exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$libdir $libdir/LLVMCore.o -lLLVMSupport $libdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir $llvmlibsdir/LLVMCore.o -lLLVMSupport $llvmlibsdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ]
if { $retval != 0 } { if { $retval != 0 } {
fail "$test: gcc returned $retval\n$msg" fail "$test: gcc returned $retval\n$msg"
continue continue