From d7e82a2d4e0f588faebfb6e44d01e685587f6872 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sat, 17 Dec 2016 13:44:03 +0000 Subject: [CMake] Rename "integrationtests" to "systemtests". This was a proposal from #500. @andreamattavelli pointed out that the lit tests are really system tests rather than integration tests so this commit fixes the inappropriate naming that I chose. --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0ae78faf..9f565444 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -126,10 +126,10 @@ configure_file(lit.site.cfg.in @ONLY ) -add_custom_target(integrationtests +add_custom_target(systemtests COMMAND "${LIT_TOOL}" ${LIT_ARGS} "${CMAKE_CURRENT_BINARY_DIR}" DEPENDS klee kleaver kleeRuntest - COMMENT "Running integration tests" + COMMENT "Running system tests" ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} ) -- cgit 1.4.1 From 4dded235b6de4254589719ce1870f6dd117095ea Mon Sep 17 00:00:00 2001 From: Dan Liew 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 ++++++++++----- test/Makefile | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'test') 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 && \ 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) ) -- cgit 1.4.1 From 01ba72697bc5476bfe486725c302bb2e0867076e Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Mon, 19 Dec 2016 12:29:48 +0000 Subject: Remove undocumented and unused `check-local`, `check-dg` and `check-lit` targets from Autoconf/Makefile build system. Having these around just confuses things. --- Makefile.rules | 26 -------------------------- test/Makefile | 10 ---------- 2 files changed, 36 deletions(-) (limited to 'test') diff --git a/Makefile.rules b/Makefile.rules index cdc61bf8..d74b1c42 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1877,32 +1877,6 @@ systemtests:: $(EchoCmd) No test directory ; \ fi -check-lit:: check - -check-dg:: - $(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-dg ; \ - else \ - $(EchoCmd) No Makefile in test directory ; \ - fi ; \ - else \ - $(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 c9924244..c96ae889 100644 --- a/test/Makefile +++ b/test/Makefile @@ -45,16 +45,6 @@ endif # Potential support in the future for multiple test suites LIT_ALL_TESTSUITES := $(LIT_TESTSUITE) -check-local:: lit.site.cfg - $(Verb) $(MAKE) -s clean - $(Verb) ( $(ULIMIT) \ - $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) ) - $(Verb) klee_last_path=$$(find . -name klee-last | head -1); \ - if [ ! -z "$$klee_last_path" ]; then \ - echo "error: one of the tests failed to use --output-dir, found: $$klee_last_path"; \ - exit 1; \ - fi - systemtests-local:: lit.site.cfg $(Verb) ( $(ULIMIT) \ $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) ) -- cgit 1.4.1