From 7f00726cb59e7ba96e860b3d90b4abdcc61c9c12 Mon Sep 17 00:00:00 2001 From: brarcher Date: Mon, 27 Jan 2014 04:41:52 +0000 Subject: [PATCH] source test_output_strings from src tree tests dir If Check is built out of tree, then the test_output_strings file was expected to be in the build tree, which is not where it is; it is in the source tree. Now find the file in the same directory that the script is in. git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@1087 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- tests/test_log_output.sh | 2 +- tests/test_output.sh | 2 +- tests/test_tap_output.sh | 2 +- tests/test_xml_output.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_log_output.sh b/tests/test_log_output.sh index 1a1dd04..9de3a80 100755 --- a/tests/test_log_output.sh +++ b/tests/test_log_output.sh @@ -3,7 +3,7 @@ OUTPUT_FILE=test.log . ./test_vars -. ./test_output_strings +. $(dirname $0)/test_output_strings test_log_output ( ) { rm -f ${OUTPUT_FILE} diff --git a/tests/test_output.sh b/tests/test_output.sh index 22ef717..5e36c1e 100755 --- a/tests/test_output.sh +++ b/tests/test_output.sh @@ -1,7 +1,7 @@ #!/bin/sh . ./test_vars -. ./test_output_strings +. $(dirname $0)/test_output_strings # When the ex_output program is run with the STDOUT_DUMP mode, it will # run with the normal output mode, then dump each output mode using diff --git a/tests/test_tap_output.sh b/tests/test_tap_output.sh index 6805915..03af402 100755 --- a/tests/test_tap_output.sh +++ b/tests/test_tap_output.sh @@ -3,7 +3,7 @@ OUTPUT_FILE=test.tap . ./test_vars -. ./test_output_strings +. $(dirname $0)/test_output_strings test_tap_output ( ) { rm -f ${OUTPUT_FILE} diff --git a/tests/test_xml_output.sh b/tests/test_xml_output.sh index fd5b710..4c87b73 100755 --- a/tests/test_xml_output.sh +++ b/tests/test_xml_output.sh @@ -4,7 +4,7 @@ OUTPUT_FILE=test.xml CK_DEFAULT_TIMEOUT=4 . ./test_vars -. ./test_output_strings +. $(dirname $0)/test_output_strings rm -f ${OUTPUT_FILE} export CK_DEFAULT_TIMEOUT -- 2.40.0