replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

llvm-svn: 159311
This commit is contained in:
Chandler Carruth 2012-06-28 00:03:15 +00:00
parent c00bdab5a8
commit fd3a5e33d5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/test/Makefile
View File

@ -12,9 +12,6 @@ DIRS =
all:: check-local all:: check-local
# 'lit' is the default test runner.
check-local:: check-local-lit
# Include other test rules # Include other test rules
include Makefile.tests include Makefile.tests
@ -52,8 +49,8 @@ endif
# Check what to run for -all. # Check what to run for -all.
LIT_ALL_TESTSUITES := $(LIT_TESTSUITE) LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
extra-lit-site-cfgs:: extra-site-cfgs::
.PHONY: extra-lit-site-cfgs .PHONY: extra-site-cfgs
ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),) ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
ifndef TESTSUITE 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 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
# Force creation of Clang's lit.site.cfg. # 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 $(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 endif
endif endif
@ -82,11 +79,14 @@ ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 1024000 ;
endif # AuroraUX endif # AuroraUX
endif # SunOS endif # SunOS
check-local-lit:: lit.site.cfg Unit/lit.site.cfg check-local:: lit.site.cfg Unit/lit.site.cfg
( $(ULIMIT) \ ( $(ULIMIT) \
$(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) $(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) \ ( $(ULIMIT) \
$(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) ) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )