Teach 'make check-all' to build the site configuration for clang, if it is in tree.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 770370183845914ceccb884bd5ac753e37ad854a..db85dda54f546490bdad05a699964a2169955980 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -46,12 +46,22 @@ ifdef VG
 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 @@ check-local-lit:: lit.site.cfg Unit/lit.site.cfg
                --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 @@ site.exp: FORCE
        @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 @@ lit.site.cfg: site.exp
        @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 >> $@