tests: Make 'lit' the default test tool. You can still use 'make check-dg' to

run the tests using DejaGNU, but not for much longer. This is a last call for
DejaGNU supporters, if no one complains soon the DejaGNU support is going to
die.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@109997 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-08-02 00:05:18 +00:00
parent b7a56ad907
commit 666b402243
2 changed files with 9 additions and 7 deletions

View File

@ -1858,11 +1858,13 @@ check::
$(EchoCmd) No test directory ; \
fi
check-lit::
check-lit:: check
check-dg::
$(Verb) if test -d "$(PROJ_OBJ_ROOT)/test" ; then \
if test -f "$(PROJ_OBJ_ROOT)/test/Makefile" ; then \
$(EchoCmd) Running test suite ; \
$(MAKE) -C $(PROJ_OBJ_ROOT)/test check-local-lit ; \
$(MAKE) -C $(PROJ_OBJ_ROOT)/test check-local-dg ; \
else \
$(EchoCmd) No Makefile in test directory ; \
fi ; \

View File

@ -10,11 +10,11 @@
LEVEL = ..
DIRS =
#
# Make Dejagnu the default for testing
#
all:: check-local
# 'lit' is the default test runner.Make Dejagnu the default for testing
check-local:: check-local-lit
# Include other test rules
include Makefile.tests
@ -90,12 +90,12 @@ endif # AuroraUX
endif # SunOS
ifneq ($(RUNTEST),)
check-local:: site.exp
check-local-dg:: site.exp
( $(ULIMIT) \
PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(LLVMGCCDIR)/bin:$(PATH)" \
$(RUNTEST) $(RUNTESTFLAGS) )
else
check-local:: site.exp
check-local-dg:: site.exp
@echo "*** dejagnu not found. Make sure 'runtest' is in your PATH, then reconfigure LLVM."
endif