From 4dded235b6de4254589719ce1870f6dd117095ea Mon Sep 17 00:00:00 2001
From: Dan Liew <daniel.liew@imperial.ac.uk>
Date: Sun, 18 Dec 2016 15:18:14 +0000
Subject: Rename old build system targets so that

* lit tests are run by the `systemtests` target
* The `check` target runs the `systemtests` and `unittests` target

This make its target names consistent with the CMake build system.
---
 Makefile.rules | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile.rules')

diff --git a/Makefile.rules b/Makefile.rules
index 20e19e26..cdc61bf8 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -21,10 +21,10 @@
 #--------------------------------------------------------------------
 RecursiveTargets := all clean clean-all install uninstall install-bytecode \
                     unitcheck
-LocalTargets     := all-local clean-local clean-all-local check-local \
+LocalTargets     := all-local clean-local clean-all-local systemtests-local \
                     install-local printvars uninstall-local \
 		    install-bytecode-local
-TopLevelTargets  := check dist dist-check dist-clean dist-gzip dist-bzip2 \
+TopLevelTargets  := check systemtests dist dist-check dist-clean dist-gzip dist-bzip2 \
                     dist-zip unittests
 UserTargets      := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets)
 InternalTargets  := preconditions distdir dist-hook
@@ -1855,15 +1855,20 @@ endif
 
 endif
 
+###############################################################################
+# Global target to run all tests
+###############################################################################
+check:: systemtests unittests
+
 ###############################################################################
 # CHECK: Running the test suite
 ###############################################################################
 
-check::
+systemtests::
 	$(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 \
+	    $(MAKE) -C $(PROJ_OBJ_ROOT)/test systemtests-local \
 	      TESTSUITE=$(TESTSUITE) ; \
 	  else \
 	    $(EchoCmd) No Makefile in test directory ; \
@@ -2001,7 +2006,7 @@ dist-check:: $(DistTarGZip)
 	  ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \
 	    --srcdir=../$(DistName) $(DIST_CHECK_CONFIG_OPTIONS) && \
 	  $(MAKE) all && \
-	  $(MAKE) check && \
+	  $(MAKE) systemtests && \
 	  $(MAKE) unittests && \
 	  $(MAKE) install && \
 	  $(MAKE) uninstall && \
-- 
cgit 1.4.1