[llvm-commits] CVS: llvm/test/Makefile

[Tanya Brethour]

Changes in directory llvm/test:

Makefile updated: 1.60 -> 1.61
---
Log message:

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.


---
Diffs of the changes:  (+7 -3)

Index: llvm/test/Makefile
diff -u llvm/test/Makefile:1.60 llvm/test/Makefile:1.61
--- llvm/test/Makefile:1.60	Sun Nov  7 02:24:59 2004
+++ llvm/test/Makefile	Sun Nov  7 15:39:41 2004
@@ -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