diff options
| author | Tanya Lattner <tonic@nondot.org> | 2004-11-07 21:39:41 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2004-11-07 21:39:41 +0000 |
| commit | 491e9cd1828b757ee89c37817b01fa0d8808afe5 (patch) | |
| tree | 76e27455cf2dbc157c4f8754cc74216cf1933f01 | |
| parent | 075cdc655e2466d6b7e98f88d2fccec26223298c (diff) | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | test/Makefile | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -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 1f0dea5233..adbca665a9 100644 --- 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 |