diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-07-07 18:18:44 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 18:18:44 (GMT) |
commit | 2a16315031cf478601ea150f7861d4f86b1350a2 (patch) | |
tree | a7bdc4b0d4cc28640a55a7689c0cccefecb3c642 /t/t9400-git-cvsserver-server.sh | |
parent | fcd91f8de20bf7969599a7a60cba73117d99f2d1 (diff) | |
parent | c9667456d201c435af523ffb7d583efd1784232a (diff) | |
download | git-2a16315031cf478601ea150f7861d4f86b1350a2.zip git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.gz git-2a16315031cf478601ea150f7861d4f86b1350a2.tar.bz2 |
Merge branch 'ab/tap'
* ab/tap:
t/README: document more test helpers
t/README: proposed rewording...
t/README: Document the do's and don'ts of tests
t/README: Add a section about skipping tests
t/README: Document test_expect_code
t/README: Document test_external*
t/README: Document the prereq functions, and 3-arg test_*
t/README: Typo: paralell -> parallel
t/README: The trash is in 't/trash directory.$name'
t/t9700/test.pl: don't access private object members, use public access methods
t9700: Use Test::More->builder, not $Test::Builder::Test
tests: Say "pass" rather than "ok" on empty lines for TAP
tests: Skip tests in a way that makes sense under TAP
test-lib: output a newline before "ok" under a TAP harness
test-lib: Make the test_external_* functions TAP-aware
test-lib: Adjust output to be valid TAP format
Diffstat (limited to 't/t9400-git-cvsserver-server.sh')
-rwxr-xr-x | t/t9400-git-cvsserver-server.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 8639506..36c457e 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -11,17 +11,17 @@ cvs CLI client via git-cvsserver server' . ./test-lib.sh if ! test_have_prereq PERL; then - say 'skipping git cvsserver tests, perl not available' + skip_all='skipping git cvsserver tests, perl not available' test_done fi cvs >/dev/null 2>&1 if test $? -ne 1 then - say 'skipping git-cvsserver tests, cvs not found' + skip_all='skipping git-cvsserver tests, cvs not found' test_done fi "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { - say 'skipping git-cvsserver tests, Perl SQLite interface unavailable' + skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable' test_done } |