Fix running tests from cmake out of tree.

test_vars was being built in tree, and while the test programs were built out of tree, the CMakeLists.txt led to trying to run them in tree.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d413e887f756e20a643d25cf6edf7fa4f3d87ba..0b40af4e396af2f28ef48bb3f186b57d117329f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,10 +325,22 @@ add_test(NAME check_check COMMAND check_check)
 
 # Only offer to run shell scripts if we may have a working interpreter
 if(UNIX OR MINGW OR MSYS)
-    add_test(NAME test_output.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_output.sh)
-    add_test(NAME test_log_output.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_log_output.sh)
-    add_test(NAME test_xml_output.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_xml_output.sh)
-    add_test(NAME test_tap_output.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_tap_output.sh)
-    add_test(NAME test_check_nofork.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_check_nofork.sh)
-    add_test(NAME test_check_nofork_teardown.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests COMMAND sh test_check_nofork_teardown.sh)
+  add_test(NAME test_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_output.sh)
+  add_test(NAME test_log_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_log_output.sh)
+  add_test(NAME test_xml_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_xml_output.sh)
+  add_test(NAME test_tap_output.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_tap_output.sh)
+  add_test(NAME test_check_nofork.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork.sh)
+  add_test(NAME test_check_nofork_teardown.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
+    COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_check_nofork_teardown.sh)
 endif(UNIX OR MINGW OR MSYS)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eb146a86c4ec44917bbf1518016ff44acafffa7f..0b101303cfd7888603f1233b6728afba98e71ecd 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,7 +38,7 @@ if(WIN32)
 endif(WIN32)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_vars.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_vars)
+  ${CMAKE_CURRENT_BINARY_DIR}/test_vars)
 
 set(CHECK_CHECK_SOURCES
   check_check_exit.c