diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-07 11:18:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 11:18:44 -0700 |
| commit | 2a16315031cf478601ea150f7861d4f86b1350a2 (patch) | |
| tree | a7bdc4b0d4cc28640a55a7689c0cccefecb3c642 /t/lib-httpd.sh | |
| parent | fcd91f8de20bf7969599a7a60cba73117d99f2d1 (diff) | |
| parent | c9667456d201c435af523ffb7d583efd1784232a (diff) | |
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/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index da4b8d5a6f..a0944d662c 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -5,8 +5,7 @@ if test -z "$GIT_TEST_HTTPD" then - say "skipping test, network testing disabled by default" - say "(define GIT_TEST_HTTPD to enable)" + skip_all="Network testing disabled (define GIT_TEST_HTTPD to enable)" test_done fi |