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.

llvm-svn: 17586
This commit is contained in:
Tanya Lattner 2004-11-07 21:39:41 +00:00
parent a7541b19fc
commit 4af4d3715e
2 changed files with 8 additions and 4 deletions

View File

@ -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)

View File

@ -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