Changed check-dejagnu to take TESTSUITE as its args instead of TEST in order to not...

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

diff --git a/Makefile b/Makefile
index a85736813895ae2383ca2983505ee9e5c37dcca5..a010d7e3e28781aa66e9b7c041b53e5ecd0d26fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,4 +37,4 @@ check ::
 tools-only: all
 
 check-dejagnu:
-       cd test; $(MAKE) check-dejagnu TEST=$(TEST)
+       cd test; $(MAKE) check-dejagnu TESTSUITE=$(TESTSUITE) TARGET=$(TARGET_TRIPLE)

diff --git a/test/Makefile b/test/Makefile
index 1f0dea5233ec225d74e092365737447baba60aa8..adbca665a98ca9d9be960fde325cdba8881806f3 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -119,11 +119,15 @@ qmtest-clean:
 # DejaGNU testing support
 #===------------------------------------------------------------------------===#
 
-EXPECT = expect
 RUNTEST = runtest
 
+ifdef TESTSUITE
+RUNTESTFLAGS := --tool $(TEST)
+endif
+
 check-dejagnu: site.exp
-       $(RUNTEST) --tool $(TEST)
+       PATH=$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) $(RUNTEST) $(RUNTESTFLAGS)
+
 
 dejagnu-clean:
        $(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
@@ -133,7 +137,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo '## these variables are automatically generated by make ##' >site.tmp
        @echo '# Do not edit here.  If you wish to override these values' >>site.tmp
        @echo '# edit the last section' >>site.tmp
-       @echo "set target_triplet i686-pc-linux-gnu" >> site.tmp
+       @echo "set target_triplet $(TARGET_TRIPLE)" >> site.tmp
        @echo 'set prcontext $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py' >> site.tmp
        @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
        @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp