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>
Ævar Arnfjörð Bjarmason committed
Jul 8, 2010 at 01:16 UTC
e8344e866655cfae1f870d7e8d5046c1bdf08adf
7 files changed
+17
-18
t/gitweb-lib.sh
+2
-2
@@ -76,12 +76,12 @@ gitweb_run () {
76
. ./test-lib.sh
77
78
if ! test_have_prereq PERL; then
79
- say 'skipping gitweb tests, perl not available'
79
+ skip_all='skipping gitweb tests, perl not available'
80
test_done
81
fi
82
83
perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
84
- say 'skipping gitweb tests, perl version is too old'
84
+ skip_all='skipping gitweb tests, perl version is too old'
85
test_done
86
}
87
t/lib-cvs.sh
+3
-3
@@ -9,7 +9,7 @@ export HOME
9
10
if ! type cvs >/dev/null 2>&1
11
then
12
- say 'skipping cvsimport tests, cvs not found'
12
+ skip_all='skipping cvsimport tests, cvs not found'
13
test_done
14
fi
15
@@ -21,11 +21,11 @@ case "$cvsps_version" in
21
2.1 | 2.2*)
22
;;
23
'')
24
- say 'skipping cvsimport tests, cvsps not found'
24
+ skip_all='skipping cvsimport tests, cvsps not found'
25
test_done
26
;;
27
*)
28
- say 'skipping cvsimport tests, unsupported cvsps version'
28
+ skip_all='skipping cvsimport tests, unsupported cvsps version'
29
test_done
30
;;
31
esac
t/lib-git-svn.sh
+5
-6
@@ -21,7 +21,7 @@ PERL=${PERL:-perl}
21
svn >/dev/null 2>&1
22
if test $? -ne 1
23
then
24
- say 'skipping git svn tests, svn not found'
24
+ skip_all='skipping git svn tests, svn not found'
25
test_done
26
fi
27
@@ -40,13 +40,12 @@ x=$?
40
if test $x -ne 0
41
then
42
if test $x -eq 42; then
43
- err='Perl SVN libraries must be >= 1.1.0'
43
+ skip_all='Perl SVN libraries must be >= 1.1.0'
44
elif test $x -eq 41; then
45
- err='svnadmin failed to create fsfs repository'
45
+ skip_all='svnadmin failed to create fsfs repository'
46
else
47
- err='Perl SVN libraries not found or unusable, skipping test'
47
+ skip_all='Perl SVN libraries not found or unusable'
48
fi
49
- say "$err"
49
test_done
50
fi
51
@@ -159,7 +158,7 @@ EOF
158
require_svnserve () {
159
if test -z "$SVNSERVE_PORT"
160
then
162
- say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
161
+ skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
162
test_done
163
fi
164
}
t/lib-httpd.sh
+4
-4
@@ -45,7 +45,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
45
46
if ! test -x "$LIB_HTTPD_PATH"
47
then
48
- say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
48
+ skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'"
49
test_done
50
fi
51
@@ -58,12 +58,12 @@ then
58
then
59
if ! test $HTTPD_VERSION -ge 2
60
then
61
- say "skipping test, at least Apache version 2 is required"
61
+ skip_all="skipping test, at least Apache version 2 is required"
62
test_done
63
fi
64
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
65
then
66
- say "Apache module directory not found. Skipping tests."
66
+ skip_all="Apache module directory not found. Skipping tests."
67
test_done
68
fi
69
@@ -118,7 +118,7 @@ start_httpd() {
118
>&3 2>&4
119
if test $? -ne 0
120
then
121
- say "skipping test, web server setup failed"
121
+ skip_all="skipping test, web server setup failed"
122
trap 'die' EXIT
123
test_done
124
fi
t/lib-patch-mode.sh
+1
-1
@@ -3,7 +3,7 @@
3
. ./test-lib.sh
4
5
if ! test_have_prereq PERL; then
6
- say 'skipping --patch tests, perl not available'
6
+ skip_all='skipping --patch tests, perl not available'
7
test_done
8
fi
9
t/t5800-remote-helpers.sh
+1
-1
@@ -15,7 +15,7 @@ if sys.hexversion < 0x02040000:
15
then
16
:
17
else
18
- say 'skipping git remote-testgit tests: requires Python 2.4 or newer'
18
+ skip_all='skipping git remote-testgit tests: requires Python 2.4 or newer'
19
test_done
20
fi
21
t/t7005-editor.sh
+1
-1
@@ -113,7 +113,7 @@ done
113
114
if ! echo 'echo space > "$1"' > "e space.sh"
115
then
116
- say "Skipping; FS does not support spaces in filenames"
116
+ skip_all="Skipping; FS does not support spaces in filenames"
117
test_done
118
fi
119