From 09f50008739b1504f69a8b72d2ab665e40f13dd4 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Thu, 12 Apr 2007 02:49:30 +0000
Subject: [PATCH] Make the shlibext and llvmlibsdir variables accessible.

llvm-svn: 35939
---
 llvm/test/Makefile        | 1 +
 llvm/test/lib/llvm-dg.exp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/llvm/test/Makefile b/llvm/test/Makefile
index ff9a67f52c1e..001e3ac62f5b 100644
--- a/llvm/test/Makefile
+++ b/llvm/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/llvm/test/lib/llvm-dg.exp b/llvm/test/lib/llvm-dg.exp
index 4d04713bcebd..6f83800888d5 100644
--- a/llvm/test/lib/llvm-dg.exp
+++ b/llvm/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