From a06cb813b7d1f2d309043dfaca1d54b2737e0abc Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 18 Sep 2013 18:27:14 +0000 Subject: [PATCH] Workaround git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30808 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/run_testsuite.cmake | 8 ++++++-- tests/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake index a07536ddaa..52bee0cd15 100644 --- a/deal.II/run_testsuite.cmake +++ b/deal.II/run_testsuite.cmake @@ -208,8 +208,12 @@ IF("${TRACK}" STREQUAL "Experimental") CTEST_CONFIGURE() ENDIF() - CTEST_BUILD(TARGET) # run all - CTEST_BUILD(TARGET setup_test APPEND) # setup tests + CTEST_BUILD(TARGET) # run all target + + # TODO: Run this during the BUILD stage... + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} + --build ${CTEST_BINARY_DIRECTORY} --target setup_test + ) CTEST_TEST(PARALLEL_LEVEL ${NO_JOBS}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2a34868a65..debb34b951 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -136,6 +136,7 @@ FOREACH(_category ${_categories}) COMMENT "Processing ./tests/${_category}" ) ADD_DEPENDENCIES(setup_test setup_test_${_category}) + ADD_DEPENDENCIES(setup_test_${_category} library) ADD_CUSTOM_TARGET(clean_test_${_category} COMMAND [ ! -d ${_category} ] || ${CMAKE_COMMAND} -- 2.39.5