Workaround

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30808 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake
index a07536ddaacc224adf16862ed126f96c59e60c96..52bee0cd15c2ee1b5b670eb72d06b1cf7d3172f4 100644 (file)
--- 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 2a34868a652bf17bddb50b63ad974e4f61cab461..debb34b951eeb3a7bafc2b2eb5d79951ae30e34c 100644 (file)
--- 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}