X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT000-basic.sh;h=7fbdcfa3036cd860b13647a1678efde2063ce621;hp=d514082d48e3b4539759fe6d0fc277b4ba572491;hb=fc12f6f07b5ee6cbcf54a30116fe0a37f8f557cd;hpb=a863de1e43ee34f6f5794a2759fdceb287e851aa diff --git a/test/T000-basic.sh b/test/T000-basic.sh index d514082d..7fbdcfa3 100755 --- a/test/T000-basic.sh +++ b/test/T000-basic.sh @@ -4,16 +4,6 @@ # test_description='the test framework itself.' - -################################################################ -# It appears that people try to run tests without building... - -if ! test -x ../notmuch -then - echo >&2 'You do not seem to have built notmuch yet.' - exit 1 -fi - . $(dirname "$0")/test-lib.sh || exit 1 ################################################################ @@ -42,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 +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