diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2017-01-18 11:02:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 11:02:52 +0000 |
| commit | b149dfa242753004d8fb00c4aa55e340d56c0d43 (patch) | |
| tree | b0a925e1de936f9b19369c18780a7492eb163f48 /test | |
| parent | aedbca881945da47005835a405188041b40ae7cc (diff) | |
| parent | 1fce0acbf4498595e3901a6f7fdbe429587e3ef0 (diff) | |
| download | klee-b149dfa242753004d8fb00c4aa55e340d56c0d43.tar.gz | |
Merge pull request #546 from delcypher/cmake_rename_test_targets
[CMake] Rename "integrationtests" to "systemtests", removed some undocumented targets and other build changes
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/Makefile | 14 |
2 files changed, 4 insertions, 14 deletions
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/test/Makefile b/test/Makefile index ed7ba197..c96ae889 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 @@ -45,17 +45,7 @@ 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 - -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) ) |