diff options
| author | Jani Nikula <jani@nikula.org> | 2017-09-25 23:38:28 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-20 19:55:41 -0300 |
| commit | fc12f6f07b5ee6cbcf54a30116fe0a37f8f557cd (patch) | |
| tree | ffacaceeb4c1db2b99d879d84db7d1fd25803a32 | |
| parent | a8cd1ec26b7ed1144c46417091a5b95c9dd201ad (diff) | |
test: use source and build paths in T000-basic.sh
Make a distinction between source and build directories.
| -rwxr-xr-x | test/T000-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/T000-basic.sh b/test/T000-basic.sh index f3808c07..7fbdcfa3 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 +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 |