diff options
| -rw-r--r-- | test/Feature/dg.exp | 1 | ||||
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | test/lib/llvm2cpp.exp | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp index ca40776a23..142de8a6c8 100644 --- a/test/Feature/dg.exp +++ b/test/Feature/dg.exp @@ -1,4 +1,3 @@ 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 - diff --git a/test/Makefile b/test/Makefile index 77e6e4ba71..f06d389261 100644 --- a/test/Makefile +++ b/test/Makefile @@ -47,8 +47,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> 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 tooldir "$(ToolDir)"' >>site.tmp - @echo 'set libdir "$(LibDir)"' >>site.tmp + @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp + @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp index 9066f77d49..8bd1044882 100644 --- a/test/lib/llvm2cpp.exp +++ b/test/lib/llvm2cpp.exp @@ -7,12 +7,12 @@ proc llvm2cpp-test { files } { # 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 path [file join $objdir $subdir] - set llvm2cpp [file join $tooldir llvm2cpp ] - set llvmas [file join $tooldir llvm-as ] - set llvmdis [file join $tooldir llvm-dis ] + set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] + set llvmas [file join $llvmtoolsdir llvm-as ] + set llvmdis [file join $llvmtoolsdir llvm-dis ] #Make Output Directory if it does not exist already if { [file exists path] } { @@ -49,8 +49,7 @@ proc llvm2cpp-test { files } { } 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 } { fail "$test: gcc returned $retval\n$msg" continue |