X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2FT000-basic.sh;h=a2f4d93fd2652a832aad55466c602a51963dfc2f;hb=77ab961a1dce3a31d1f0edf5c9bd83c295575835;hp=f3808c0753a26b932c445583bc1ab861fbcc342c;hpb=e1bd4f23634a88a49256c74e0780dd1dcdb852cd;p=notmuch diff --git a/test/T000-basic.sh b/test/T000-basic.sh index f3808c07..a2f4d93f 100755 --- a/test/T000-basic.sh +++ b/test/T000-basic.sh @@ -32,19 +32,19 @@ fi test_begin_subtest 'failure to clean up causes the test to fail' test_expect_code 2 'test_when_finished "(exit 2)"' -EXPECTED=$TEST_DIRECTORY/test.expected-output -suppress_diff_date() { +EXPECTED=$NOTMUCH_SRCDIR/test/test.expected-output +suppress_diff_date () { sed -e 's/\(.*\-\-\- test-verbose\.4\.\expected\).*/\1/' \ -e 's/\(.*\+\+\+ test-verbose\.4\.\output\).*/\1/' } test_begin_subtest "Ensure that test output is suppressed unless the test fails" -output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date) +output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= $NOTMUCH_SRCDIR/test/test-verbose 2>&1 | suppress_diff_date) expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date) test_expect_equal "$output" "$expected" test_begin_subtest "Ensure that -v does not suppress test output" -output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date) +output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= $NOTMUCH_SRCDIR/test/test-verbose -v 2>&1 | suppress_diff_date) expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) # Do not include the results of test-verbose in totals rm $TEST_DIRECTORY/test-results/test-verbose