From: Joshua D. Boyd <jdboyd@jdboyd.net>
Date: Wed, 30 Mar 2016 07:13:11 +0000 (-0400)
Subject: Fix running tests from cmake out of tree.
X-Git-Tag: 0.11.0~30^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1a4f970d2336b8e44f736dfcfd11f89354fa34a;p=check

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 1d413e8..0b40af4 100644
--- 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 eb146a8..0b10130 100644
--- 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