mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Use skip_all=* to skip tests

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2010-07-08 01:16:06 +00:00
committed by Junio C Hamano
parent 4ecb79386d
commit e8344e8666
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/lib-httpd.sh
View File

@ -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