[llvm-commits] [llvm] r82374 - in /llvm/trunk: Makefile.rules test/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Sun Sep 20 01:17:21 2009
New Revision: 82374

URL: http://llvm.org/viewvc/llvm-project?rev=82374&view=rev
Log:
Add 'make check-all', which runs the LLVM tests along with the clang tests if
its in the standard location.

Modified:
    llvm/trunk/Makefile.rules
    llvm/trunk/test/Makefile

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=82374&r1=82373&r2=82374&view=diff

==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sun Sep 20 01:17:21 2009
@@ -1613,6 +1613,18 @@
 	  $(EchoCmd) No test directory ; \
 	fi
 
+check-all::
+	$(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-all ; \
+	  else \
+	    $(EchoCmd) No Makefile in test directory ; \
+	  fi ; \
+	else \
+	  $(EchoCmd) No test directory ; \
+	fi
+
 ###############################################################################
 # UNITTESTS: Running the unittests test suite
 ###############################################################################

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

==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Sun Sep 20 01:17:21 2009
@@ -46,6 +46,15 @@
 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 :=
+LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
+ifndef TESTSUITE
+ifeq ($(shell test -d $(PROJ_SRC_DIR)/../tools/clang && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
+endif
+endif
+
 IGNORE_TESTS :=
 
 ifndef RUNLLVM2CPP
@@ -81,6 +90,14 @@
 		--path "$(LLVMGCCDIR)/bin" \
 		$(LIT_ARGS) $(LIT_TESTSUITE) )
 
+check-local-all:: lit.site.cfg Unit/lit.site.cfg $(EXTRA_LIT_SITE_CFGS)
+	( $(ULIMIT) \
+	  $(LLVM_SRC_ROOT)/utils/lit/lit.py \
+		--path "$(LLVMToolDir)" \
+		--path "$(LLVM_SRC_ROOT)/test/Scripts" \
+		--path "$(LLVMGCCDIR)/bin" \
+		$(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
+
 ifdef TESTONE
 CLEANED_TESTONE := $(patsubst %/,%,$(TESTONE))
 CLEANED_TESTONE := $(patsubst test/%,%,$(CLEANED_TESTONE))