X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fbasic;h=9c94b62c99df3d4e0cba2d74231e85a9d2355540;hp=eb109533c9d6b9ec56416283c176982c7c92cb67;hb=84719b08f757a6079f4c3331d0c476d19b265948;hpb=7263aa9ec3f72bb65a491b2c64345ab5258b24ee diff --git a/test/basic b/test/basic index eb109533..9c94b62c 100755 --- a/test/basic +++ b/test/basic @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright (c) 2005 Junio C Hamano # @@ -49,6 +49,26 @@ test_expect_code 2 'failure to clean up causes the test to fail' ' test_when_finished "(exit 2)" ' +EXPECTED=$TEST_DIRECTORY/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) +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) +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 +rm -r $TEST_DIRECTORY/tmp.test-verbose +test_expect_equal "$output" "$expected" + + ################################################################ # Test mail store prepared in test-lib.sh @@ -68,6 +88,6 @@ test_expect_success \ test_expect_success \ 'PATH is set to this repository' \ - 'test "`echo $PATH|cut -f1 -d:`" = "`dirname ${TEST_DIRECTORY}`"' + 'test "`echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,'`" = "`dirname ${TEST_DIRECTORY}`"' test_done