]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Remove buggy and undocumented variable handling 746/head
authorMatthias Maier <tamiko@43-1.org>
Tue, 7 Apr 2015 09:34:46 +0000 (11:34 +0200)
committerMatthias Maier <tamiko@43-1.org>
Tue, 7 Apr 2015 11:38:13 +0000 (13:38 +0200)
tests/CMakeLists.txt
tests/setup_testsubproject.cmake

index a28d2f449dc009fe84bf848b13d2895db7384017..1fe05763a9ebb8f541202101b1f4f08b4d8f2cbe 100644 (file)
@@ -75,13 +75,10 @@ ENDIF()
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake "")
 
 #
-# Append further configuration to _options:
+# Always undefine the following variables in the setup_tests target:
 #
 FOREACH(_var DIFF_DIR NUMDIFF_DIR TEST_PICKUP_REGEX TEST_TIME_LIMIT)
   LIST(APPEND _options "-U${_var}")
-  IF(DEFINED ${_var})
-    LIST(APPEND _options "-D${_var}=${${_var}}")
-  ENDIF()
 ENDFOREACH()
 
 SET(_categories
@@ -136,6 +133,7 @@ FOREACH(_category ${_categories})
     COMMAND
       test ! -d ${CMAKE_CURRENT_BINARY_DIR}/${_category} || ${CMAKE_COMMAND}
       --build ${CMAKE_CURRENT_BINARY_DIR}/${_category} --target regenerate
+      > /dev/null
     COMMENT "Processing tests/${_category}"
     )
   ADD_DEPENDENCIES(regen_tests regen_tests_${_category})
index 80892765f249a5a9bd97135551b1e04708b3ee4c..02a5e10d5abc8c274a5d3833ab54ad4b80a5437f 100644 (file)
@@ -4,7 +4,7 @@ SET(CMAKE_BUILD_TYPE DebugRelease CACHE STRING "" FORCE)
 DEAL_II_INITIALIZE_CACHED_VARIABLES()
 
 FOREACH(_var DIFF_DIR NUMDIFF_DIR TEST_PICKUP_REGEX TEST_TIME_LIMIT)
-  SET_IF_EMPTY(${_var} "${${_var}}")
+  SET_IF_EMPTY(${_var} "$ENV{${_var}}")
   SET(${_var} "${${_var}}" CACHE STRING "" FORCE)
 ENDFOREACH()
 

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.