diff options
| author | Dan Liew <daniel.liew@imperial.ac.uk> | 2016-12-18 15:18:14 +0000 |
|---|---|---|
| committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2017-01-16 22:45:05 +0000 |
| commit | 4dded235b6de4254589719ce1870f6dd117095ea (patch) | |
| tree | a225c166756d6e0e87ca7cc8cd24bc38045427c9 | |
| parent | d7e82a2d4e0f588faebfb6e44d01e685587f6872 (diff) | |
| download | klee-4dded235b6de4254589719ce1870f6dd117095ea.tar.gz | |
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.
| -rw-r--r-- | Makefile.rules | 15 | ||||
| -rw-r--r-- | test/Makefile | 4 |
2 files changed, 12 insertions, 7 deletions
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 @@ -1856,14 +1856,19 @@ 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 && \ diff --git a/test/Makefile b/test/Makefile index ed7ba197..c9924244 100644 --- a/test/Makefile +++ b/test/Makefile @@ -13,7 +13,7 @@ DIRS = # # Make llvm-lit the default for testing # -all:: check-local +all:: systemtests-local # Include other test rules include Makefile.tests @@ -55,7 +55,7 @@ check-local:: lit.site.cfg exit 1; \ fi -check-local-all:: lit.site.cfg +systemtests-local:: lit.site.cfg $(Verb) ( $(ULIMIT) \ $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) ) |