diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-07-08 01:16:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-08 17:53:12 -0700 |
| commit | e8344e866655cfae1f870d7e8d5046c1bdf08adf (patch) | |
| tree | 5e194fa5e5933ad3b1b5c98a8a976adbe7c2f0a0 /t/lib-httpd.sh | |
| parent | 4ecb79386d2f45f3b439b397ac4aa592e1f4e9c8 (diff) | |
| download | git-e8344e866655cfae1f870d7e8d5046c1bdf08adf.tar.gz | |
tests: Use skip_all=* to skip tests
Change tests to skip with skip_all=* + test_done instead of using say
+ test_done.
This is a follow-up to "tests: Skip tests in a way that makes sense
under TAP" (fadb5156e4). I missed these cases when prepearing that
patch, hopefully this is all of them.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index a0944d662c..71effc5bec 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -45,7 +45,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www if ! test -x "$LIB_HTTPD_PATH" then - say "skipping test, no web server found at '$LIB_HTTPD_PATH'" + skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'" test_done fi @@ -58,12 +58,12 @@ then then if ! test $HTTPD_VERSION -ge 2 then - say "skipping test, at least Apache version 2 is required" + skip_all="skipping test, at least Apache version 2 is required" test_done fi if ! test -d "$DEFAULT_HTTPD_MODULE_PATH" then - say "Apache module directory not found. Skipping tests." + skip_all="Apache module directory not found. Skipping tests." test_done fi @@ -118,7 +118,7 @@ start_httpd() { >&3 2>&4 if test $? -ne 0 then - say "skipping test, web server setup failed" + skip_all="skipping test, web server setup failed" trap 'die' EXIT test_done fi |