From: Matthias Maier Date: Tue, 7 Apr 2015 09:34:46 +0000 (+0200) Subject: Testsuite: Remove buggy and undocumented variable handling X-Git-Tag: v8.3.0-rc1~310^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c84fac021d20f502378a2d80fe284932b54cccb8;p=dealii.git Testsuite: Remove buggy and undocumented variable handling --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a28d2f449d..1fe05763a9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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}) diff --git a/tests/setup_testsubproject.cmake b/tests/setup_testsubproject.cmake index 80892765f2..02a5e10d5a 100644 --- a/tests/setup_testsubproject.cmake +++ b/tests/setup_testsubproject.cmake @@ -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()