diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/java/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/regress/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/system/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 5 |
5 files changed, 9 insertions, 14 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a79e96c65..f601e5247 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,6 +4,8 @@ # > regression tests of levels 0 and 1 # > system tests +add_custom_target(build-tests) + # Note: Do not add custom targets for running tests (regress, systemtests, # units) as dependencies to other run targets. This will result in executing # tests multiple times. For example, if check would depend on regress it would @@ -12,7 +14,9 @@ # Dependencies of check are added in the corresponding subdirectories. add_custom_target(check COMMAND - ctest --output-on-failure -LE "regress[2-4]" -j${CTEST_NTHREADS} $(ARGS)) + ctest --output-on-failure -LE "regress[2-4]" -j${CTEST_NTHREADS} $(ARGS) + DEPENDS + build-tests) #-----------------------------------------------------------------------------# # Add subdirectories diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt index b6f0d035a..169013b84 100644 --- a/test/java/CMakeLists.txt +++ b/test/java/CMakeLists.txt @@ -18,7 +18,7 @@ add_jar(build-javatests OUTPUT_NAME javatests ) add_dependencies(build-javatests cvc4jar) -add_dependencies(check build-javatests) +add_dependencies(build-tests build-javatests) # Add java tests to ctest set(classpath "${CMAKE_CURRENT_BINARY_DIR}/javatests.jar") diff --git a/test/regress/CMakeLists.txt b/test/regress/CMakeLists.txt index 79b706fdb..ecd98ddc2 100644 --- a/test/regress/CMakeLists.txt +++ b/test/regress/CMakeLists.txt @@ -2080,10 +2080,7 @@ get_target_property(path_to_cvc4 cvc4-bin RUNTIME_OUTPUT_DIRECTORY) set(run_regress_script ${CMAKE_CURRENT_LIST_DIR}/run_regression.py) add_custom_target(build-regress DEPENDS cvc4-bin) -add_dependencies(check build-regress) -if(ENABLE_COVERAGE) - add_dependencies(coverage build-regress) -endif() +add_dependencies(build-tests build-regress) add_custom_target(regress COMMAND diff --git a/test/system/CMakeLists.txt b/test/system/CMakeLists.txt index 36e6c4a37..9d0d8424a 100644 --- a/test/system/CMakeLists.txt +++ b/test/system/CMakeLists.txt @@ -8,10 +8,7 @@ include_directories(${CMAKE_BINARY_DIR}/src) # > system tests add_custom_target(build-systemtests) -add_dependencies(check build-systemtests) -if(ENABLE_COVERAGE) - add_dependencies(coverage build-systemtests) -endif() +add_dependencies(build-tests build-systemtests) add_custom_target(systemtests COMMAND ctest --output-on-failure -L "system" -j${CTEST_NTHREADS} $(ARGS) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index d362870c1..aa9248e6c 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -14,10 +14,7 @@ include_directories(${CMAKE_BINARY_DIR}/src) # > unit tests add_custom_target(build-units) -add_dependencies(check build-units) -if(ENABLE_COVERAGE) - add_dependencies(coverage build-units) -endif() +add_dependencies(build-tests build-units) add_custom_target(units COMMAND ctest --output-on-failure -L "unit" -j${CTEST_NTHREADS} $(ARGS) |