tests: remove exit after test_done call
test_done always exits, so this line is never executed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Apr 3, 2009 at 15:31 UTC
5dba35912474770d0df45ed801d78c4c9ed5e949
17 files changed
-26
t/lib-git-svn.sh
-4
@@ -7,7 +7,6 @@ if test -n "$NO_SVN_TESTS"
7
then
8
say 'skipping git svn tests, NO_SVN_TESTS defined'
9
test_done
10
- exit
10
fi
11
12
GIT_DIR=$PWD/.git
@@ -19,7 +18,6 @@ if test $? -ne 1
18
then
19
say 'skipping git svn tests, svn not found'
20
test_done
22
- exit
21
fi
22
23
svnrepo=$PWD/svnrepo
@@ -43,7 +41,6 @@ then
41
fi
42
say "$err"
43
test_done
46
- exit
44
fi
45
46
rawsvnrepo="$svnrepo"
@@ -144,7 +141,6 @@ require_svnserve () {
141
then
142
say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
143
test_done
147
- exit
144
fi
145
}
146
t/lib-httpd.sh
-3
@@ -8,7 +8,6 @@ then
8
say "skipping test, network testing disabled by default"
9
say "(define GIT_TEST_HTTPD to enable)"
10
test_done
11
- exit
11
fi
12
13
HTTPD_PARA=""
@@ -36,7 +35,6 @@ if ! test -x "$LIB_HTTPD_PATH"
35
then
36
say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
37
test_done
39
- exit
38
fi
39
40
HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
@@ -50,7 +48,6 @@ then
48
then
49
say "skipping test, at least Apache version 2 is required"
50
test_done
53
- exit
51
fi
52
53
LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
t/t4004-diff-rename-symlink.sh
-1
@@ -16,7 +16,6 @@ if ! test_have_prereq SYMLINKS
16
then
17
say 'Symbolic links not supported, skipping tests.'
18
test_done
19
- exit
19
fi
20
21
test_expect_success \
t/t4011-diff-symlink.sh
-1
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
13
then
14
say 'Symbolic links not supported, skipping tests.'
15
test_done
16
- exit
16
fi
17
18
cat > expected << EOF
t/t4023-diff-rename-typechange.sh
-1
@@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
8
then
9
say 'Symbolic links not supported, skipping tests.'
10
test_done
11
- exit
11
fi
12
13
test_expect_success setup '
t/t4114-apply-typechange.sh
-1
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
13
then
14
say 'Symbolic links not supported, skipping tests.'
15
test_done
16
- exit
16
fi
17
18
test_expect_success 'setup repository and commits' '
t/t4115-apply-symlink.sh
-1
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
13
then
14
say 'Symbolic links not supported, skipping tests.'
15
test_done
16
- exit
16
fi
17
18
test_expect_success setup '
t/t4122-apply-symlink-inside.sh
-1
@@ -7,7 +7,6 @@ if ! test_have_prereq SYMLINKS
7
then
8
say 'Symbolic links not supported, skipping tests.'
9
test_done
10
- exit
10
fi
11
12
lecho () {
t/t5503-tagfollow.sh
-1
@@ -8,7 +8,6 @@ case $(uname -s) in
8
*MINGW*)
9
say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
10
test_done
11
- exit
11
esac
12
13
# End state of the repository:
t/t5522-pull-symlink.sh
-1
@@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
8
then
9
say 'Symbolic links not supported, skipping tests.'
10
test_done
11
- exit
11
fi
12
13
# The scenario we are building:
t/t5540-http-push.sh
-1
@@ -17,7 +17,6 @@ if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
17
then
18
say "skipping test, USE_CURL_MULTI is not defined"
19
test_done
20
- exit
20
fi
21
22
. "$TEST_DIRECTORY"/lib-httpd.sh
t/t7005-editor.sh
-1
@@ -92,7 +92,6 @@ if ! echo 'echo space > "$1"' > "e space.sh"
92
then
93
say "Skipping; FS does not support spaces in filenames"
94
test_done
95
- exit
95
fi
96
97
test_expect_success 'editor with a space' '
t/t9200-git-cvsexportcommit.sh
-1
@@ -11,7 +11,6 @@ if test $? -ne 1
11
then
12
say 'skipping git cvsexportcommit tests, cvs not found'
13
test_done
14
- exit
14
fi
15
16
CVSROOT=$(pwd)/cvsroot
t/t9400-git-cvsserver-server.sh
-2
@@ -15,12 +15,10 @@ if test $? -ne 1
15
then
16
say 'skipping git-cvsserver tests, cvs not found'
17
test_done
18
- exit
18
fi
19
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
20
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
21
test_done
23
- exit
22
}
23
24
unset GIT_DIR GIT_CONFIG
t/t9401-git-cvsserver-crlf.sh
-2
@@ -51,12 +51,10 @@ if test $? -ne 1
51
then
52
say 'skipping git-cvsserver tests, cvs not found'
53
test_done
54
- exit
54
fi
55
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
56
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
57
test_done
59
- exit
58
}
59
60
unset GIT_DIR GIT_CONFIG
t/t9500-gitweb-standalone-no-errors.sh
-1
@@ -68,7 +68,6 @@ gitweb_run () {
68
perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
69
say 'skipping gitweb tests, perl version is too old'
70
test_done
71
- exit
71
}
72
73
gitweb_init
t/t9600-cvsimport.sh
-3
@@ -14,7 +14,6 @@ if ! type cvs >/dev/null 2>&1
14
then
15
say 'skipping cvsimport tests, cvs not found'
16
test_done
17
- exit
17
fi
18
19
cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
@@ -24,12 +23,10 @@ case "$cvsps_version" in
23
'')
24
say 'skipping cvsimport tests, cvsps not found'
25
test_done
27
- exit
26
;;
27
*)
28
say 'skipping cvsimport tests, unsupported cvsps version'
29
test_done
32
- exit
30
;;
31
esac
32