]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Speedup Makefiles
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 14:24:50 +0000 (14:24 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 14:24:50 +0000 (14:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30418 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_add_test.cmake
deal.II/cmake/scripts/run_test.cmake

index 39434867edf8cec40ad5d50c61aba5ed9ef6f938..8b80bf7741f14fb893f8c88b7807f16efd71aeab 100644 (file)
@@ -111,10 +111,14 @@ MACRO(DEAL_II_ADD_TEST _category _test_name)
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
         )
 
+      IF(CMAKE_GENERATOR MATCHES "Makefiles")
+        SET(_test_suffix "/fast")
+      ENDIF()
 
       ADD_TEST(NAME ${_category}/${_test}
         COMMAND ${CMAKE_COMMAND}
           -DTEST=${_test}
+          -DTEST_SUFFIX=${_test_suffix}
           -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR}
           -P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_test}
index f0a6a438cd3f684bb5e606f59ac10ee0508d743b..c488a1e3a668baaa91a64c330f3d019e7738e10a 100644 (file)
@@ -1,13 +1,14 @@
 #
-# The following variables have to be set:
+# TODO: The following variables have to be set:
 #
 # TEST
+# TEST_SUFFIX
 # DEAL_II_BINARY_DIR
 #
 
-MACRO(CALLBACK _target _msg_success _msg_error)
+MACRO(CALLBACK _target _target_suffix _msg_success _msg_error)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
-    --build ${DEAL_II_BINARY_DIR} --target ${_target}
+    --build ${DEAL_II_BINARY_DIR} --target ${_target}${_target_suffix}
     RESULT_VARIABLE _result_code
     OUTPUT_VARIABLE _output
     )
@@ -24,15 +25,15 @@ MACRO(CALLBACK _target _msg_success _msg_error)
 ENDMACRO()
 
 
-CALLBACK(${TEST}
+CALLBACK(${TEST} "${TEST_SUFFIX}"
   "Build successful" "BUILD FAILED"
   )
 
-CALLBACK(${TEST}.run
+CALLBACK(${TEST} ".run"
   "Run successful" "RUN FAILED"
   )
 
-CALLBACK(${TEST}.diff
+CALLBACK(${TEST} ".diff"
   "Diff successful" "DIFF FAILED"
   )
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.