Skip to content

Commit

Permalink
tests: remove exit after test_done call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Apr 5, 2009
1 parent f3a186f commit 5dba359
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 26 deletions.
4 changes: 0 additions & 4 deletions t/lib-git-svn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ if test -n "$NO_SVN_TESTS"
then
say 'skipping git svn tests, NO_SVN_TESTS defined'
test_done
exit
fi

GIT_DIR=$PWD/.git
Expand All @@ -19,7 +18,6 @@ if test $? -ne 1
then
say 'skipping git svn tests, svn not found'
test_done
exit
fi

svnrepo=$PWD/svnrepo
Expand All @@ -43,7 +41,6 @@ then
fi
say "$err"
test_done
exit
fi

rawsvnrepo="$svnrepo"
Expand Down Expand Up @@ -144,7 +141,6 @@ require_svnserve () {
then
say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
test_done
exit
fi
}

Expand Down
3 changes: 0 additions & 3 deletions t/lib-httpd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ then
say "skipping test, network testing disabled by default"
say "(define GIT_TEST_HTTPD to enable)"
test_done
exit
fi

HTTPD_PARA=""
Expand Down Expand Up @@ -36,7 +35,6 @@ if ! test -x "$LIB_HTTPD_PATH"
then
say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
test_done
exit
fi

HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
Expand All @@ -50,7 +48,6 @@ then
then
say "skipping test, at least Apache version 2 is required"
test_done
exit
fi

LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
Expand Down
1 change: 0 additions & 1 deletion t/t4004-diff-rename-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

test_expect_success \
Expand Down
1 change: 0 additions & 1 deletion t/t4011-diff-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

cat > expected << EOF
Expand Down
1 change: 0 additions & 1 deletion t/t4023-diff-rename-typechange.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

test_expect_success setup '
Expand Down
1 change: 0 additions & 1 deletion t/t4114-apply-typechange.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

test_expect_success 'setup repository and commits' '
Expand Down
1 change: 0 additions & 1 deletion t/t4115-apply-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

test_expect_success setup '
Expand Down
1 change: 0 additions & 1 deletion t/t4122-apply-symlink-inside.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

lecho () {
Expand Down
1 change: 0 additions & 1 deletion t/t5503-tagfollow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ case $(uname -s) in
*MINGW*)
say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
test_done
exit
esac

# End state of the repository:
Expand Down
1 change: 0 additions & 1 deletion t/t5522-pull-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
then
say 'Symbolic links not supported, skipping tests.'
test_done
exit
fi

# The scenario we are building:
Expand Down
1 change: 0 additions & 1 deletion t/t5540-http-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
then
say "skipping test, USE_CURL_MULTI is not defined"
test_done
exit
fi

. "$TEST_DIRECTORY"/lib-httpd.sh
Expand Down
1 change: 0 additions & 1 deletion t/t7005-editor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ if ! echo 'echo space > "$1"' > "e space.sh"
then
say "Skipping; FS does not support spaces in filenames"
test_done
exit
fi

test_expect_success 'editor with a space' '
Expand Down
1 change: 0 additions & 1 deletion t/t9200-git-cvsexportcommit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ if test $? -ne 1
then
say 'skipping git cvsexportcommit tests, cvs not found'
test_done
exit
fi

CVSROOT=$(pwd)/cvsroot
Expand Down
2 changes: 0 additions & 2 deletions t/t9400-git-cvsserver-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ if test $? -ne 1
then
say 'skipping git-cvsserver tests, cvs not found'
test_done
exit
fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
test_done
exit
}

unset GIT_DIR GIT_CONFIG
Expand Down
2 changes: 0 additions & 2 deletions t/t9401-git-cvsserver-crlf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ if test $? -ne 1
then
say 'skipping git-cvsserver tests, cvs not found'
test_done
exit
fi
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'
test_done
exit
}

unset GIT_DIR GIT_CONFIG
Expand Down
1 change: 0 additions & 1 deletion t/t9500-gitweb-standalone-no-errors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ gitweb_run () {
perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
say 'skipping gitweb tests, perl version is too old'
test_done
exit
}

gitweb_init
Expand Down
3 changes: 0 additions & 3 deletions t/t9600-cvsimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ if ! type cvs >/dev/null 2>&1
then
say 'skipping cvsimport tests, cvs not found'
test_done
exit
fi

cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
Expand All @@ -24,12 +23,10 @@ case "$cvsps_version" in
'')
say 'skipping cvsimport tests, cvsps not found'
test_done
exit
;;
*)
say 'skipping cvsimport tests, unsupported cvsps version'
test_done
exit
;;
esac

Expand Down

0 comments on commit 5dba359

Please sign in to comment.