test: make script exit (1) if it "fails" to source (.) a file

[notmuch] / test / T360-symbol-hiding.sh

diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 8fc4bdf61f9021f624cca0bfbbbbbebee775b43e..4ec0ea65710baba535cc7910fd3e55895f7edce6 100755 (executable)
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -9,18 +9,19 @@
 
 test_description='exception symbol hiding'
 
-. ./test-lib.sh
-
-run_test(){
-    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)
-}
-
-output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
-caught No chert database found at path \`./nonexistant'"
-
-mkdir -p fakedb/.notmuch
-
-test_expect_success 'running test' run_test
+. ./test-lib.sh || exit 1
+
+test_begin_subtest 'running test' run_test
+mkdir -p ${PWD}/fakedb/.notmuch
+( LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
+                $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent \
+                2>&1 | sed "s,${PWD},CWD,g") > OUTPUT
+
+cat <<EOF > EXPECTED
+A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
+caught No chert database found at path \`CWD/nonexistent'
+EOF
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest 'checking output'
 test_expect_equal "$result" "$output"