aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-20 06:17:21 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-20 06:17:21 +0000
commit5b6816d9f3b0fc2e47a458e07d63586aaaf8718f (patch)
tree2aa5bf259ab6d224dd4f7953704dfe68cb013e54
parent681869cb3d72675bb06147c36d9fb31fe8f1ad2e (diff)
downloadexternal_llvm-5b6816d9f3b0fc2e47a458e07d63586aaaf8718f.zip
external_llvm-5b6816d9f3b0fc2e47a458e07d63586aaaf8718f.tar.gz
external_llvm-5b6816d9f3b0fc2e47a458e07d63586aaaf8718f.tar.bz2
Add 'make check-all', which runs the LLVM tests along with the clang tests if
its in the standard location. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82374 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules12
-rw-r--r--test/Makefile17
2 files changed, 29 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 7999c7a..6cc4bd3 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1613,6 +1613,18 @@ check-lit::
$(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
###############################################################################
diff --git a/test/Makefile b/test/Makefile
index 661f791..7703701 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -46,6 +46,15 @@ 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 :=
+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 @@ 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)
+ ( $(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))