diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-08-02 00:05:18 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-08-02 00:05:18 +0000 |
| commit | 666b40224324f99b011dc7ee08acf254f718e7b1 (patch) | |
| tree | daf7327730aa582068f29d71571de07227c6fb67 | |
| parent | b7a56ad907e036c74ee1cb91769622c2db5c3f96 (diff) | |
| download | external_llvm-666b40224324f99b011dc7ee08acf254f718e7b1.zip external_llvm-666b40224324f99b011dc7ee08acf254f718e7b1.tar.gz external_llvm-666b40224324f99b011dc7ee08acf254f718e7b1.tar.bz2 | |
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
| -rw-r--r-- | Makefile.rules | 6 | ||||
| -rw-r--r-- | test/Makefile | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.rules b/Makefile.rules index 0b0f02c..b1744f1 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -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 ; \ diff --git a/test/Makefile b/test/Makefile index 044f75b..dc28e6d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 |