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>

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index de384e6ac3a125e59156abbf897a3371f736bbfa..cdd7ccdd2ac87e27bd6912e92477e986517c32ad 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -7,7 +7,6 @@ if test -n "$NO_SVN_TESTS"
 then
        say 'skipping git svn tests, NO_SVN_TESTS defined'
        test_done
 then
        say 'skipping git svn tests, NO_SVN_TESTS defined'
        test_done

-       exit

 fi
 
 GIT_DIR=$PWD/.git
 fi
 
 GIT_DIR=$PWD/.git


@@ -19,7 +18,6 @@ if test $? -ne 1
 then
     say 'skipping git svn tests, svn not found'
     test_done
 then
     say 'skipping git svn tests, svn not found'
     test_done

-    exit

 fi
 
 svnrepo=$PWD/svnrepo
 fi
 
 svnrepo=$PWD/svnrepo


@@ -43,7 +41,6 @@ then
        fi
        say "$err"
        test_done
        fi
        say "$err"
        test_done

-       exit

 fi
 
 rawsvnrepo="$svnrepo"
 fi
 
 rawsvnrepo="$svnrepo"


@@ -144,7 +141,6 @@ require_svnserve () {
     then
         say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
         test_done
     then
         say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
         test_done

-        exit

     fi
 }
 
     fi
 }
 

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 589aaf82149916c43d42fad488567e34b26aebaa..cde659d14ac599e78bb4cd12a2ad88eab179549e 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -8,7 +8,6 @@ then
        say "skipping test, network testing disabled by default"
        say "(define GIT_TEST_HTTPD to enable)"
        test_done
        say "skipping test, network testing disabled by default"
        say "(define GIT_TEST_HTTPD to enable)"
        test_done

-       exit

 fi
 
 HTTPD_PARA=""
 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
 then
        say "skipping test, no web server found at '$LIB_HTTPD_PATH'"
        test_done

-       exit

 fi
 
 HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
 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
                then
                        say "skipping test, at least Apache version 2 is required"
                        test_done

-                       exit

                fi
 
                LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
                fi
 
                LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"

diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh
index 3db74443f838bec13be54d983972a8646e3a2ac5..a4da1196a93a00502c8945a14e3aafd628efda53 100755 (executable)
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -16,7 +16,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 test_expect_success \
 fi
 
 test_expect_success \

diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 3a8130996739766f8168fe2908814987395d53a2..d7e327cc5bc5984546032fb085fb581de5755e11 100755 (executable)
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 cat > expected << EOF
 fi
 
 cat > expected << EOF

diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 5099862ebac7cf381759783c5a3b696edb7ba5bf..9bdf6596d82878f709a375084095697124a97609 100755 (executable)
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 test_expect_success setup '
 fi
 
 test_expect_success setup '

diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index 7dc35dea38b39ebc49c022714779ae07a9c17d88..99ec13dd531c71299681acc3eb678b490ff68707 100755 (executable)
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 test_expect_success 'setup repository and commits' '
 fi
 
 test_expect_success 'setup repository and commits' '

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 1a3aea34cec6552f40271bbed60e42d199ef25be..b852e5898009bca0205c231033f8f72f48962b81 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 test_expect_success setup '
 fi
 
 test_expect_success setup '

diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 8aad20bfccc09310e2663f6bdab046520ae43fa9..0d3c1d5dd5c0f35f9cc44eab4fcba5ba2e36ddd7 100755 (executable)
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -7,7 +7,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 lecho () {
 fi
 
 lecho () {

diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index e75ccbcaebbe8cf2ac0fdf5dfe474a9b9a3043ab..d5db75d826c8584e1d7f0f5ef298021fecd6f055 100755 (executable)
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -8,7 +8,6 @@ case $(uname -s) in
 *MINGW*)
        say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
        test_done
 *MINGW*)
        say "GIT_DEBUG_SEND_PACK not supported - skipping tests"
        test_done

-       exit

 esac
 
 # End state of the repository:
 esac
 
 # End state of the repository:

diff --git a/t/t5522-pull-symlink.sh b/t/t5522-pull-symlink.sh
index d887eb6c1ac1084effb9ab422d471e8c52754700..86bbd7d024ff6b1ee775ec737c550d54f9371ad7 100755 (executable)
--- a/t/t5522-pull-symlink.sh
+++ b/t/t5522-pull-symlink.sh
@@ -8,7 +8,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done

-       exit

 fi
 
 # The scenario we are building:
 fi
 
 # The scenario we are building:

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index c46592f03de2adfbb04f81ad2167e33a161d6d1b..5fe479e1c2362ba05d059805d412b605aa7a83aa 100755 (executable)
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -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
 then
        say "skipping test, USE_CURL_MULTI is not defined"
        test_done

-       exit

 fi
 
 . "$TEST_DIRECTORY"/lib-httpd.sh
 fi
 
 . "$TEST_DIRECTORY"/lib-httpd.sh

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index e83bc8fd89c35db06f9bd8f0f4861c0b61c11023..b647957d75fa0d0ce4d88c7c3c7243f31af38b4a 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.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
 then
        say "Skipping; FS does not support spaces in filenames"
        test_done

-       exit

 fi
 
 test_expect_success 'editor with a space' '
 fi
 
 test_expect_success 'editor with a space' '

diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 995f60771aba68fda37c311954c16ab1f044ee3d..36656923ac2dbf76a76173181b8244fcfa55edc2 100755 (executable)
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -11,7 +11,6 @@ if test $? -ne 1
 then
     say 'skipping git cvsexportcommit tests, cvs not found'
     test_done
 then
     say 'skipping git cvsexportcommit tests, cvs not found'
     test_done

-    exit

 fi
 
 CVSROOT=$(pwd)/cvsroot
 fi
 
 CVSROOT=$(pwd)/cvsroot

diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 466240cd415fe544ed55d991e176129e7f869b79..39185db6c962ee95caf35cc5ad9d26f228224f44 100755 (executable)
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -15,12 +15,10 @@ if test $? -ne 1
 then
     say 'skipping git-cvsserver tests, cvs not found'
     test_done
 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
 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
 }
 
 unset GIT_DIR GIT_CONFIG

diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 888223013444999817a93082418fb60690a425e3..12e0e508226cb9197ad3f419387dfcfb3ab9e0d9 100755 (executable)
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -51,12 +51,10 @@ if test $? -ne 1
 then
     say 'skipping git-cvsserver tests, cvs not found'
     test_done
 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
 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
 }
 
 unset GIT_DIR GIT_CONFIG

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 9ec5030a91965847d4ae546b47e4f43badb1693b..0bd332c4932c796f9bb3547d4a708cebbd9cfc2c 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -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
 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
 }
 
 gitweb_init

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index d2379e7f62a4da76791e65dbc2c70f4dfe14ff3b..33eb51938dbf90f93d10c2cf1d0edfc788befece 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -14,7 +14,6 @@ if ! type cvs >/dev/null 2>&1
 then
        say 'skipping cvsimport tests, cvs not found'
        test_done
 then
        say 'skipping cvsimport tests, cvs not found'
        test_done

-       exit

 fi
 
 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
 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
 '')
        say 'skipping cvsimport tests, cvsps not found'
        test_done

-       exit

        ;;
 *)
        say 'skipping cvsimport tests, unsupported cvsps version'
        test_done
        ;;
 *)
        say 'skipping cvsimport tests, unsupported cvsps version'
        test_done

-       exit

        ;;
 esac
 
        ;;
 esac