Make the shlibext and llvmlibsdir variables accessible.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35939 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index ff9a67f52c1ee943fc8c4b6d9ea32674f6b67c0b..001e3ac62f5bad7088f09510d5de1976662d5fb8 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -67,6 +67,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @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 shlibext "$(SHLIBEXT)"' >> 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

diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 4d04713bcebdf49a5d0b5d9d094f47e351eb3437..6f83800888d50e7432c396fe4cf119361fad19b1 100644 (file)
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -1,7 +1,7 @@
 proc llvm-runtest { programs } { 
     global srcroot objroot srcdir objdir subdir target_triplet prcontext 
     global llvmgcc llvmgxx global llvmgcc_version llvmgccmajvers 
-    global gccpath gxxpath compile_c compile_cxx link 
+    global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
 
     set timeout 60
 
@@ -60,6 +60,10 @@ proc llvm-runtest { programs } {
                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 %shlibext with shared library extension
+               regsub -all {%shlibext} $new_runline "$shlibext" new_runline
+               #replace %llvmlibsdir with configure library directory
+               regsub -all {%llvmlibsdir} $new_runline "$llvmlibsdir" new_runline
                #replace %p with path to source, 
                regsub -all {%p} $new_runline [file join $srcdir $subdir] new_runline
                #replace %s with filename