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_"

diff --git a/cmake/macros/macro_deal_ii_add_test.cmake b/cmake/macros/macro_deal_ii_add_test.cmake
index 98835b9a35c4ba3bf91235bb6667d0dc5b392cc5..f029325c41b126faf8c717b3933f39670da86391 100644 (file)
--- 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 b8b7303ab8b2365e8b5bb1393fd3e59b47641ef6..5a5356fc27632be2bae3bd8d5dccc198c18e11bf 100644 (file)
--- 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 e8698c4f17268e25f508270fed208f9b9fefe64b..a86dc6e63914b1632b9f40a8b6c64bdeaf3247f5 100644 (file)
--- 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 3d29a9bd4f0bd7de7ec9305d5f89dcc8f79769b5..b63e1a3f9c6c3d1e4038dbd4926f0ce33d8079d3 100644 (file)
--- 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 06ee66fa466dd76c963535b698a41db3ff11ae9f..33922a000e6595da46c3f8f6714adb0f3d99c181 100644 (file)
--- 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 4bac44690ce1521ea9fbcb087310b96a700a2947..d0e8a9fdc3f35f2283c44f15634bfb57b1815e21 100644 (file)
--- 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 33e256cd6ee6ebff6ffd654e9df58fcd724348fe..1647fc7835d35f442e70fb7085a993bf7ece2d91 100644 (file)
--- 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}
     )