X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fbasic;h=1b842d2bf1d309029a52db2d29ca3b0a703ec859;hp=725c753885d27a7785406985a25239cc7645e3c7;hb=b173037398ae61ddc1017f94c8a63a71b1b4c3fc;hpb=102c57c825d22c8f4741332f1e02e08f66f6cd2f

diff --git a/test/basic b/test/basic
index 725c7538..1b842d2b 100755
--- a/test/basic
+++ b/test/basic
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2005 Junio C Hamano
 #
@@ -51,10 +51,39 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
 
 # Ensure that all tests are being run
 test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
-tests_in_suite=$(grep TESTS= ../notmuch-test | sed -e "s/TESTS=\"\(.*\)\"/\1/" | tr " " "\n" | sort)
-available=$(ls -1 ../ | grep -v -E "^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test|README|test-lib.sh|test-results|tmp.*|valgrind|corpus*|emacs.expected-output|smtp-dummy|smtp-dummy.c)" | sort)
+eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
+tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
+available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
+    ! -name aggregate-results.sh	\
+    ! -name arg-test			\
+    ! -name notmuch-test		\
+    ! -name parse-time			\
+    ! -name smtp-dummy			\
+    ! -name symbol-test			\
+    ! -name test-verbose		\
+    | sed 's,.*/,,' | sort)
 test_expect_equal "$tests_in_suite" "$available"
 
+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; ./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; ./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