summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-07-31 16:40:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-02 18:53:48 (GMT)
commit092c433407279219cb21819d971da0fbf4a60dcd (patch)
tree8f9f42f462bb95a3d3737d1072eddda25c302b04 /t
parentc9667456d201c435af523ffb7d583efd1784232a (diff)
downloadgit-092c433407279219cb21819d971da0fbf4a60dcd.zip
git-092c433407279219cb21819d971da0fbf4a60dcd.tar.gz
git-092c433407279219cb21819d971da0fbf4a60dcd.tar.bz2
test-lib: Ignore --quiet under a TAP harness
Running the tests with --quiet under a TAP harness will always fail, since a TAP harness always needs actual test output to go along with the plan that's being emitted. Change the test-lib.sh to ignore the --quiet option under HARNESS_ACTIVE to work around this. Then users that have --quiet in their GIT_TEST_OPTS can run tests under prove(1) without everything breaking. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rw-r--r--t/test-lib.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ac496aa..a827a0f 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -127,7 +127,9 @@ do
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
verbose=t; shift ;;
-q|--q|--qu|--qui|--quie|--quiet)
- quiet=t; shift ;;
+ # Ignore --quiet under a TAP::Harness. Saying how many tests
+ # passed without the ok/not ok details is always an error.
+ test -z "$HARNESS_ACTIVE" && quiet=t; shift ;;
--with-dashes)
with_dashes=t; shift ;;
--no-color)