mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
test: use source and build paths in T000-basic.sh
Make a distinction between source and build directories.
This commit is contained in:
parent
a8cd1ec26b
commit
fc12f6f07b
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue