diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-02 18:53:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 18:53:58 (GMT) |
| commit | 7d808125a0197e5660a57f77d14937604b16e39a (patch) | |
| tree | 2cae786324401f909cfd54828b18b8719225d85e /t | |
| parent | ac2e1e632e50c682305fee902b32b1a23ce71546 (diff) | |
| parent | d596f33abba4e6ba15a13335a26a68a2c1b7ef7d (diff) | |
| download | git-7d808125a0197e5660a57f77d14937604b16e39a.zip git-7d808125a0197e5660a57f77d14937604b16e39a.tar.gz git-7d808125a0197e5660a57f77d14937604b16e39a.tar.bz2 | |
Merge branch 'ab/tap' into maint
* ab/tap:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index e5523dd..e8f21d5 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -127,14 +127,13 @@ 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) color=; shift ;; - --no-python) - # noop now... - shift ;; --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind) valgrind=t; verbose=t; shift ;; --tee) |