t5800: use skip_all instead of prereq

All tests require python 2.4 or higher.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 3a37ad07078893b35ec4df01482b4c639c060051..f6796e3d34334bed853f6a901712b1ac64185c7c 100755 (executable)
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -7,15 +7,19 @@ test_description='Test remote-helper import and export commands'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if test_have_prereq PYTHON && "$PYTHON_PATH" -c '
+if ! test_have_prereq PYTHON ; then
+       skip_all='skipping git-remote-hg tests, python not available'
+       test_done
+fi
+
+"$PYTHON_PATH" -c '

 import sys
 if sys.hexversion < 0x02040000:
     sys.exit(1)
 import sys
 if sys.hexversion < 0x02040000:
     sys.exit(1)

-'
-then
-    # Requires Python 2.4 or newer
-       test_set_prereq PYTHON_24
-fi
+' || {
+       skip_all='skipping git-remote-hg tests, python version < 2.4'
+       test_done
+}

 
 compare_refs() {
        git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
 
 compare_refs() {
        git --git-dir="$1/.git" rev-parse --verify $2 >expect &&


@@ -23,7 +27,7 @@ compare_refs() {
        test_cmp expect actual
 }
 
        test_cmp expect actual
 }
 

-test_expect_success PYTHON_24 'setup repository' '
+test_expect_success 'setup repository' '

        git init --bare server/.git &&
        git clone server public &&
        (cd public &&
        git init --bare server/.git &&
        git clone server public &&
        (cd public &&


@@ -33,34 +37,34 @@ test_expect_success PYTHON_24 'setup repository' '
         git push origin master)
 '
 
         git push origin master)
 '
 

-test_expect_success PYTHON_24 'cloning from local repo' '
+test_expect_success 'cloning from local repo' '

        git clone "testgit::${PWD}/server" localclone &&
        test_cmp public/file localclone/file
 '
 
        git clone "testgit::${PWD}/server" localclone &&
        test_cmp public/file localclone/file
 '
 

-test_expect_success PYTHON_24 'cloning from remote repo' '
+test_expect_success 'cloning from remote repo' '

        git clone "testgit::file://${PWD}/server" clone &&
        test_cmp public/file clone/file
 '
 
        git clone "testgit::file://${PWD}/server" clone &&
        test_cmp public/file clone/file
 '
 

-test_expect_success PYTHON_24 'create new commit on remote' '
+test_expect_success 'create new commit on remote' '

        (cd public &&
         echo content >>file &&
         git commit -a -m two &&
         git push)
 '
 
        (cd public &&
         echo content >>file &&
         git commit -a -m two &&
         git push)
 '
 

-test_expect_success PYTHON_24 'pulling from local repo' '
+test_expect_success 'pulling from local repo' '

        (cd localclone && git pull) &&
        test_cmp public/file localclone/file
 '
 
        (cd localclone && git pull) &&
        test_cmp public/file localclone/file
 '
 

-test_expect_success PYTHON_24 'pulling from remote remote' '
+test_expect_success 'pulling from remote remote' '

        (cd clone && git pull) &&
        test_cmp public/file clone/file
 '
 
        (cd clone && git pull) &&
        test_cmp public/file clone/file
 '
 

-test_expect_success PYTHON_24 'pushing to local repo' '
+test_expect_success 'pushing to local repo' '

        (cd localclone &&
        echo content >>file &&
        git commit -a -m three &&
        (cd localclone &&
        echo content >>file &&
        git commit -a -m three &&


@@ -68,12 +72,12 @@ test_expect_success PYTHON_24 'pushing to local repo' '
        compare_refs localclone HEAD server HEAD
 '
 
        compare_refs localclone HEAD server HEAD
 '
 

-test_expect_success PYTHON_24 'synch with changes from localclone' '
+test_expect_success 'synch with changes from localclone' '

        (cd clone &&
         git pull)
 '
 
        (cd clone &&
         git pull)
 '
 

-test_expect_success PYTHON_24 'pushing remote local repo' '
+test_expect_success 'pushing remote local repo' '

        (cd clone &&
        echo content >>file &&
        git commit -a -m four &&
        (cd clone &&
        echo content >>file &&
        git commit -a -m four &&