diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-06-28 00:03:15 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-06-28 00:03:15 +0000 |
| commit | 2378aa7ad71ab355e2e49209161b1df6fe6ac167 (patch) | |
| tree | f757f2e1ff4b98cf3482a0292b763928df6a01d7 | |
| parent | c1a0af1bd3d8843dc1c2d997463bed69e7b6f5a7 (diff) | |
| download | llvm-2378aa7ad71ab355e2e49209161b1df6fe6ac167.tar.gz llvm-2378aa7ad71ab355e2e49209161b1df6fe6ac167.tar.bz2 llvm-2378aa7ad71ab355e2e49209161b1df6fe6ac167.tar.xz | |
Remove the last vestiges of the '-lit' and '-dg' test runner split by
removing '-lit' qualifiers from make rules. I've left a legacy
'check-local-lit' rule in case build scripts have this encoded
somewhere.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159311 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/Makefile b/test/Makefile index b16d6099c7..671bf8e1c6 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,9 +12,6 @@ DIRS = all:: check-local -# 'lit' is the default test runner. -check-local:: check-local-lit - # Include other test rules include Makefile.tests @@ -52,8 +49,8 @@ endif # Check what to run for -all. LIT_ALL_TESTSUITES := $(LIT_TESTSUITE) -extra-lit-site-cfgs:: -.PHONY: extra-lit-site-cfgs +extra-site-cfgs:: +.PHONY: extra-site-cfgs ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),) ifndef TESTSUITE @@ -61,9 +58,9 @@ ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK) LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test # Force creation of Clang's lit.site.cfg. -clang-lit-site-cfg: FORCE +clang-site-cfg: FORCE $(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg -extra-lit-site-cfgs:: clang-lit-site-cfg +extra-site-cfgs:: clang-site-cfg endif endif endif @@ -82,11 +79,14 @@ ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 1024000 ; endif # AuroraUX endif # SunOS -check-local-lit:: lit.site.cfg Unit/lit.site.cfg +check-local:: lit.site.cfg Unit/lit.site.cfg ( $(ULIMIT) \ $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) -check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-lit-site-cfgs +# This is a legacy alias dating from when both DejaGNU and lit were in use. +check-local-lit:: check-local + +check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-site-cfgs ( $(ULIMIT) \ $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) ) |