cmake: Run make coverage in parallel by default.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36d88c12f0749ea6d4425325e3563b78f434d7bb..011ff2fe5350fe79c70a375581b9eab18cdaf830 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,16 @@ option(BUILD_BINDINGS_PYTHON "Build Python bindings")
 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
 
@@ -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 e1205faa076bfc96a459f65f25d75ae691d1f11b..44cf5a6517b8c6c942ba21de01d2734662698fe2 100644 (file)
--- 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 e0bdc2bfc4bbce3835cd15ff5f2cb5b9a7288d00..88be6b94bd9800cc2723b842cf9f80c95614d591 100644 (file)
--- 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 2ca33d1e99d3adc9fb8e46b10c2e8da6f96802a2..ab9b5387d11a58e227613dd82a7f51e803ffcc67 100644 (file)
--- 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 3e90fb33371f0f021011ac4d505d4cb74ad2d30d..3d1007929047a925d28bfa67253c374df0e797c0 100644 (file)
--- 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