diff options
| -rwxr-xr-x | .travis/klee.sh | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | README-CMake.md | 4 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/klee-stats/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/ktest-tool/CMakeLists.txt | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/.travis/klee.sh b/.travis/klee.sh index 7ecfe78a..09fb175a 100755 --- a/.travis/klee.sh +++ b/.travis/klee.sh @@ -191,7 +191,7 @@ fi # lit tests ############################################################################### if [ "X${USE_CMAKE}" == "X1" ]; then - make integrationtests + make systemtests else # Note can't use ``make check`` because llvm-lit is not available cd test diff --git a/CMakeLists.txt b/CMakeLists.txt index e860f3e2..7d392f18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -699,24 +699,24 @@ if ((NOT LIT_TOOL) OR (NOT EXISTS "${LIT_TOOL}")) message(STATUS "Using lit: ${LIT_TOOL}") endif() - option(ENABLE_UNIT_TESTS "Enable unittests" ON) + option(ENABLE_UNIT_TESTS "Enable unit tests" ON) if (ENABLE_UNIT_TESTS) message(STATUS "Unit tests enabled") add_subdirectory(unittests) else() message(STATUS "Unit tests disabled") endif() - option(ENABLE_INTEGRATION_TESTS "Enable integration tests" ON) - if (ENABLE_INTEGRATION_TESTS) - message(STATUS "Integration tests enabled") + option(ENABLE_SYSTEM_TESTS "Enable system tests" ON) + if (ENABLE_SYSTEM_TESTS) + message(STATUS "System tests enabled") add_subdirectory(test) else() - message(STATUS "Integration tests disabled") + message(STATUS "System tests disabled") endif() # Add global test target add_custom_target(check - DEPENDS unittests integrationtests + DEPENDS unittests systemtests COMMENT "Running tests" ) else() diff --git a/README-CMake.md b/README-CMake.md index 991694cd..896ddda6 100644 --- a/README-CMake.md +++ b/README-CMake.md @@ -10,7 +10,7 @@ its autoconf/Makefile based build system. * `docs` - Build documentation * `edit_cache` - Show cmake/ccmake/cmake-gui interface for chaning configure options. * `help` - Show list of top level targets -* `integrationtests` - Run integration tests +* `systemtests` - Run system tests * `unittests` - Build and run unittests ## Useful CMake variables @@ -36,7 +36,7 @@ cmake -DCMAKE_BUILD_TYPE=Release /path/to/klee/src * `ENABLE_DOXYGEN` (BOOLEAN) - Enable building doxygen documentation. -* `ENABLE_INTEGRATION_TESTS` (BOOLEAN) - Enable KLEE integration tests. +* `ENABLE_SYSTEM_TESTS` (BOOLEAN) - Enable KLEE system tests. * `ENABLE_KLEE_ASSERTS` (BOOLEAN) - Enable assertions when building KLEE. 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} ) diff --git a/tools/klee-stats/CMakeLists.txt b/tools/klee-stats/CMakeLists.txt index c742f430..e5f21162 100644 --- a/tools/klee-stats/CMakeLists.txt +++ b/tools/klee-stats/CMakeLists.txt @@ -9,5 +9,5 @@ install(PROGRAMS klee-stats DESTINATION bin) # Copy into the build directory's binary directory -# so integration tests can find it +# so system tests can find it configure_file(klee-stats "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/klee-stats" COPYONLY) diff --git a/tools/ktest-tool/CMakeLists.txt b/tools/ktest-tool/CMakeLists.txt index 76e31ac0..dbb00e91 100644 --- a/tools/ktest-tool/CMakeLists.txt +++ b/tools/ktest-tool/CMakeLists.txt @@ -9,5 +9,5 @@ install(PROGRAMS ktest-tool DESTINATION bin) # Copy into the build directory's binary directory -# so integration tests can find it +# so system tests can find it configure_file(ktest-tool "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ktest-tool" COPYONLY) |