зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
f3a186ffad
Коммит
5dba359124
|
@ -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
|
||||
|
@ -19,7 +18,6 @@ if test $? -ne 1
|
|||
then
|
||||
say 'skipping git svn tests, svn not found'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
svnrepo=$PWD/svnrepo
|
||||
|
@ -43,7 +41,6 @@ then
|
|||
fi
|
||||
say "$err"
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
rawsvnrepo="$svnrepo"
|
||||
|
@ -144,7 +141,6 @@ require_svnserve () {
|
|||
then
|
||||
say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -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=""
|
||||
|
@ -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 | \
|
||||
|
@ -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"
|
||||
|
|
|
@ -16,7 +16,6 @@ if ! test_have_prereq SYMLINKS
|
|||
then
|
||||
say 'Symbolic links not supported, skipping tests.'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
test_expect_success \
|
||||
|
|
|
@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
|
|||
then
|
||||
say 'Symbolic links not supported, skipping tests.'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
cat > expected << EOF
|
||||
|
|
|
@ -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 '
|
||||
|
|
|
@ -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' '
|
||||
|
|
|
@ -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 '
|
||||
|
|
|
@ -7,7 +7,6 @@ if ! test_have_prereq SYMLINKS
|
|||
then
|
||||
say 'Symbolic links not supported, skipping tests.'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
lecho () {
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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' '
|
||||
|
|
|
@ -11,7 +11,6 @@ if test $? -ne 1
|
|||
then
|
||||
say 'skipping git cvsexportcommit tests, cvs not found'
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
|
||||
CVSROOT=$(pwd)/cvsroot
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'`
|
||||
|
@ -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
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче