From 124a4c59f98e22db8585960045354e492189778f Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 2 Sep 2013 19:58:37 +0000 Subject: [PATCH] Bugfix: Also rename variables in DEAL_II_ADD_TEST git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30553 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_deal_ii_add_test.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake index 61c3fbf018..dfbed27215 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -30,10 +30,10 @@ # # The following variables must be set: # -# DEAL_II_TEST_DIFF +# TEST_DIFF # - specifying the executable and command line of the diff command to use # -# DEAL_II_TEST_TIME_LIMIT +# TEST_TIME_LIMIT # - specifying the maximal wall clock time in seconds a test is allowed # to run # @@ -122,8 +122,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff COMMAND - # TODO: Refactor... - ${DEAL_II_TEST_DIFF} + ${TEST_DIFF} ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${_comparison} > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff @@ -154,7 +153,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ) SET_TESTS_PROPERTIES(${_category}/${_test} PROPERTIES LABEL "${_category}" - TIMEOUT ${DEAL_II_TEST_TIME_LIMIT} + TIMEOUT ${TEST_TIME_LIMIT} ) ENDIF() -- 2.39.5