From 152e000fc09990da0c6e7ef22ed856050296ebc7 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 27 Mar 2015 11:16:59 +0100 Subject: [PATCH] Testsuite: Rename "DEAL_II_BINARY_DIR" to "BINARY_DIR" The variable has nothing to do with the binary directory of deal.II itself. Consequently, strip the "DEAL_II_" --- cmake/macros/macro_deal_ii_add_test.cmake | 2 +- cmake/scripts/run_test.cmake | 4 ++-- tests/a-framework/CMakeLists.txt | 2 +- tests/all-headers/CMakeLists.txt | 2 +- tests/build_tests/CMakeLists.txt | 2 +- tests/mesh_converter/CMakeLists.txt | 2 +- tests/quick_tests/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/macros/macro_deal_ii_add_test.cmake b/cmake/macros/macro_deal_ii_add_test.cmake index 98835b9a35..f029325c41 100644 --- a/cmake/macros/macro_deal_ii_add_test.cmake +++ b/cmake/macros/macro_deal_ii_add_test.cmake @@ -277,7 +277,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) -DTRGT=${_diff_target} -DTEST=${_test_full} -DEXPECT=${_expect} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} + -DBINARY_DIR=${CMAKE_BINARY_DIR} -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc -P ${DEAL_II_PATH}/${DEAL_II_SHARE_RELDIR}/scripts/run_test.cmake WORKING_DIRECTORY ${_test_directory} diff --git a/cmake/scripts/run_test.cmake b/cmake/scripts/run_test.cmake index b8b7303ab8..5a5356fc27 100644 --- a/cmake/scripts/run_test.cmake +++ b/cmake/scripts/run_test.cmake @@ -20,7 +20,7 @@ # # TRGT - the name of the target that should be invoked # TEST - the test name (used for status messages) -# DEAL_II_BINARY_DIR - the build directory that contains the target +# BINARY_DIR - the build directory that contains the target # # Optional options: # EXPECT - the stage this test must reach to be considered successful @@ -53,7 +53,7 @@ IF("${EXPECT}" STREQUAL "") ENDIF() EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} - --build ${DEAL_II_BINARY_DIR} --target ${TRGT} + --build ${BINARY_DIR} --target ${TRGT} RESULT_VARIABLE _result_code # ignored ;-) OUTPUT_VARIABLE _output ) diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt index e8698c4f17..a86dc6e639 100644 --- a/tests/a-framework/CMakeLists.txt +++ b/tests/a-framework/CMakeLists.txt @@ -21,7 +21,7 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) ) ADD_TEST(NAME ${_test} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target} -DTEST=${_test} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} -DEXPECT=CONFIGURE + -DBINARY_DIR=${CMAKE_BINARY_DIR} -DEXPECT=CONFIGURE -P ${DEAL_II_PATH}/${DEAL_II_SHARE_RELDIR}/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt index 3d29a9bd4f..b63e1a3f9c 100644 --- a/tests/all-headers/CMakeLists.txt +++ b/tests/all-headers/CMakeLists.txt @@ -81,7 +81,7 @@ FOREACH(_header ${_headers}) # And finally add the test: ADD_TEST(NAME ${_test} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target}.build -DTEST=${_test} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} + -DBINARY_DIR=${CMAKE_BINARY_DIR} -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}_interrupt_guard.cc -P ${DEAL_II_PATH}/${DEAL_II_SHARE_RELDIR}/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt index 06ee66fa46..33922a000e 100644 --- a/tests/build_tests/CMakeLists.txt +++ b/tests/build_tests/CMakeLists.txt @@ -188,7 +188,7 @@ FOREACH(_step_full ${_steps}) # And finally add the test: ADD_TEST(NAME ${_test} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target} -DTEST=${_test} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} + -DBINARY_DIR=${CMAKE_BINARY_DIR} -DGUARD_FILE=${_step_dir}/interrupt_guard -P ${DEAL_II_PATH}/${DEAL_II_SHARE_RELDIR}/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tests/mesh_converter/CMakeLists.txt b/tests/mesh_converter/CMakeLists.txt index 4bac44690c..d0e8a9fdc3 100644 --- a/tests/mesh_converter/CMakeLists.txt +++ b/tests/mesh_converter/CMakeLists.txt @@ -97,7 +97,7 @@ FOREACH(_full_file ${_meshes}) COMMAND ${CMAKE_COMMAND} -DTRGT=${_mesh}.diff -DTEST=${_test_full} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} + -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${DEAL_II_SOURCE_DIR}/tests/run_test.cmake WORKING_DIRECTORY ${_test_directory} ) diff --git a/tests/quick_tests/CMakeLists.txt b/tests/quick_tests/CMakeLists.txt index 33e256cd6e..1647fc7835 100644 --- a/tests/quick_tests/CMakeLists.txt +++ b/tests/quick_tests/CMakeLists.txt @@ -66,7 +66,7 @@ MACRO(make_quicktest test_basename build_name mpi_run) ADD_TEST(NAME ${_target} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target}.run -DTEST=${_target} - -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} + -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -- 2.39.5