[llvm-commits] [llvm] r82400 - /llvm/trunk/test/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Sun Sep 20 14:04:28 2009
New Revision: 82400

URL: http://llvm.org/viewvc/llvm-project?rev=82400&view=rev
Log:
Teach 'make check-all' to build the site configuration for clang, if it is in tree.

Modified:
    llvm/trunk/test/Makefile

Modified: llvm/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=82400&r1=82399&r2=82400&view=diff

==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Sun Sep 20 14:04:28 2009
@@ -46,12 +46,22 @@
 VALGRIND := valgrind --tool=memcheck --quiet --trace-children=yes --error-exitcode=3 --leak-check=full $(VALGRIND_EXTRA_ARGS)
 endif
 
-# Check what to run for -all
-EXTRA_LIT_SITE_CFGS :=
+# Check what to run for -all.
 LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
+
+extra-lit-site-cfgs::
+.PHONY: extra-lit-site-cfgs
+
+ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
 ifndef TESTSUITE
 ifeq ($(shell test -d $(PROJ_SRC_DIR)/../tools/clang && 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
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg
+extra-lit-site-cfgs:: clang-lit-site-cfg
+endif
 endif
 endif
 
@@ -90,7 +100,7 @@
 		--path "$(LLVMGCCDIR)/bin" \
 		$(LIT_ARGS) $(LIT_TESTSUITE) )
 
-check-local-all:: lit.site.cfg Unit/lit.site.cfg $(EXTRA_LIT_SITE_CFGS)
+check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-lit-site-cfgs
 	( $(ULIMIT) \
 	  $(LLVM_SRC_ROOT)/utils/lit/lit.py \
 		--path "$(LLVMToolDir)" \
@@ -179,7 +189,7 @@
 	@mv site.tmp site.exp
 
 lit.site.cfg: site.exp
-	@echo "Making 'lit.site.cfg' file..."
+	@echo "Making LLVM 'lit.site.cfg' file..."
 	@echo "## Autogenerated by Makefile ##" > $@
 	@echo "# Do not edit!" >> $@
 	@echo >> $@
@@ -190,7 +200,7 @@
 	@echo "lit.load_config(config, \"\"\"$(LLVM_SRC_ROOT)/test/lit.cfg\"\"\")" >> $@
 
 Unit/lit.site.cfg: Unit/.dir FORCE
-	@echo "Making unittest 'lit.site.cfg' file..."
+	@echo "Making LLVM unittest 'lit.site.cfg' file..."
 	@echo "## Autogenerated by Makefile ##" > $@
 	@echo "# Do not edit!" >> $@
 	@echo >> $@