diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | test/regress/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/system/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 2 |
5 files changed, 17 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 36d88c12f..011ff2fe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,16 @@ set(OPTIMIZATION_LEVEL 3) set(GPL_LIBS "") #-----------------------------------------------------------------------------# +# Determine number of threads available, used to configure (default) parallel +# execution of custom test targets (can be overriden with ARGS=-jN). + +include(ProcessorCount) +ProcessorCount(CTEST_NTHREADS) +if(CTEST_NTHREADS EQUAL 0) + set(CTEST_NTHREADS 1) +endif() + +#-----------------------------------------------------------------------------# # Build types # Note: Module CodeCoverage requires the name of the debug build to conform @@ -221,7 +231,7 @@ if(ENABLE_COVERAGE) add_definitions(-DCVC4_COVERAGE) setup_target_for_coverage_lcov( NAME coverage - EXECUTABLE ctest $(ARGS) + EXECUTABLE ctest -j${CTEST_NTHREADS} $(ARGS) DEPENDENCIES cvc4-bin) endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e1205faa0..44cf5a651 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,11 +1,3 @@ -# Determine number of threads available, used to configure (default) parallel -# execution of custom test targets (can be overriden with ARGS=-jN). -include(ProcessorCount) -ProcessorCount(NTHREADS) -if(NTHREADS EQUAL 0) - set(NTHREADS 1) -endif() - #-----------------------------------------------------------------------------# # Add subdirectories @@ -27,7 +19,8 @@ endif() # > system tests add_custom_target(check - COMMAND ctest --output-on-failure -LE "regress[2-4]" -j${NTHREADS} $(ARGS) + COMMAND + ctest --output-on-failure -LE "regress[2-4]" -j${CTEST_NTHREADS} $(ARGS) DEPENDS regress systemtests) if(BUILD_BINDINGS_JAVA) add_dependencies(check cvc4javatests) diff --git a/test/regress/CMakeLists.txt b/test/regress/CMakeLists.txt index e0bdc2bfc..88be6b94b 100644 --- a/test/regress/CMakeLists.txt +++ b/test/regress/CMakeLists.txt @@ -2075,7 +2075,8 @@ 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(regress - COMMAND ctest --output-on-failure -L "regress[0-1]" -j${NTHREADS} $(ARGS) + COMMAND + ctest --output-on-failure -L "regress[0-1]" -j${CTEST_NTHREADS} $(ARGS) DEPENDS cvc4-bin) macro(cvc4_add_regression_test level file) diff --git a/test/system/CMakeLists.txt b/test/system/CMakeLists.txt index 2ca33d1e9..ab9b5387d 100644 --- a/test/system/CMakeLists.txt +++ b/test/system/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${CMAKE_BINARY_DIR}/src) # > system tests add_custom_target(systemtests - COMMAND ctest --output-on-failure -L "system" -j${NTHREADS} $(ARGS) + COMMAND ctest --output-on-failure -L "system" -j${CTEST_NTHREADS} $(ARGS) DEPENDS cvc4) set(CVC4_SYSTEM_TEST_FLAGS diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 3e90fb333..3d1007929 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${CMAKE_BINARY_DIR}/src) # > unit tests add_custom_target(units - COMMAND ctest --output-on-failure -L "unit" -j${NTHREADS} $(ARGS)) + COMMAND ctest --output-on-failure -L "unit" -j${CTEST_NTHREADS} $(ARGS)) set(CVC4_CXXTEST_FLAGS_BLACK -D__BUILDING_CVC4LIB_UNIT_TEST -D__BUILDING_CVC4PARSERLIB_UNIT_TEST |