Make 'features' testsuite work with the /shared changes.

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

diff --git a/test/Feature/Makefile b/test/Feature/Makefile
index ffbad50e6bd978d91979c2780c3436b0db03efe5..c7f585de9852ce2640b3308049f33e7150ac980f 100644 (file)
--- a/test/Feature/Makefile
+++ b/test/Feature/Makefile
@@ -23,10 +23,10 @@ testcodegen : $(OTESTS:%.ll=%.mc)
 testsparc   : $(OTESTS:%.ll=%.s)
 
 Output/%.asmdis: % $(LAS) $(LDIS) Output/.dir
-       @./TestAsmDisasm.sh $<
+       @./TestAsmDisasm.sh $< $(TOOLDEBUG) $(LIBDEBUG)
 
 Output/%.opt: % $(LAS) $(LDIS) $(LOPT) Output/.dir
-       @./TestOptimizer.sh $<
+       @./TestOptimizer.sh $< $(TOOLDEBUG) $(LIBDEBUG)
 
 Output/%.mc: Output/%.bc $(LLC)
        @echo "======== Generating machine instructions for $<"

diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 79ff5c314a7f20d78b46b9bfdffe1e53b51b448a..0b8faef9b22a8515f433999b16028a8b14940b47 100755 (executable)
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -4,11 +4,11 @@
 
 rm -f test.bc.temp[12]
 
-LD_LIBRARY_PATH=../../lib/Debug
+LD_LIBRARY_PATH=$3
 export LD_LIBRARY_PATH
 
-AS=../../tools/Debug/as
-DIS=../../tools/Debug/dis
+AS=$2/as
+DIS=$2/dis
 
 echo "======== Running assembler/disassembler test on $1"
 

diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index cfc89c3e33f64bb45f5ff755060d19fabb45c280..fa31f0e45c5f17a24a3b168978a5a5a804610f15 100755 (executable)
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-LD_LIBRARY_PATH=../../lib/Debug
+LD_LIBRARY_PATH=$3
 export LD_LIBRARY_PATH
 
-AS=../../tools/Debug/as
-DIS=../../tools/Debug/dis
-OPT=../../tools/Debug/opt
+AS=$2/as
+DIS=$2/dis
+OPT=$2/opt
 
 echo "======== Running optimizier test on $1"