Changed check-dejagnu to take TESTSUITE as its args instead of TEST in order to not conflict with other stuff. Added path for test/Scripts. Also added a check to deal with TESTSUITE and runtest flags.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17586 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile b/test/Makefile
index 1f0dea5..adbca66 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -119,11 +119,15 @@
# 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 @@
@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