lib-patch-mode tests: change from skip_all=* to prereq skip

Change this test to skip test with test prerequisites, and to do setup
work in tests. This improves the skipped statistics on platforms where
the test isn't run.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-patch-mode.sh b/t/lib-patch-mode.sh
index 375e2486511656df4294f0a4b750fd8d3f16d273..06c3c9176207af6c27c924377f29cc2bd0c881e5 100644 (file)
--- a/t/lib-patch-mode.sh
+++ b/t/lib-patch-mode.sh
@@ -2,11 +2,6 @@
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq PERL; then
-       skip_all='skipping --patch tests, perl not available'
-       test_done
-fi
-

 set_state () {
        echo "$3" > "$1" &&
        git add "$1" &&
 set_state () {
        echo "$3" > "$1" &&
        git add "$1" &&

diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index 2144184d790055ab12dfbb53ec10f519de598f72..7657ec190c2620b1eda03522c0f392a2c6f78f5a 100755 (executable)
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -4,7 +4,7 @@ test_description='git checkout --patch'
 
 . ./lib-patch-mode.sh
 
 
 . ./lib-patch-mode.sh
 

-test_expect_success 'setup' '
+test_expect_success PERL 'setup' '

        mkdir dir &&
        echo parent > dir/foo &&
        echo dummy > bar &&
        mkdir dir &&
        echo parent > dir/foo &&
        echo dummy > bar &&


@@ -18,40 +18,40 @@ test_expect_success 'setup' '
 
 # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
 
 
 # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
 

-test_expect_success 'saying "n" does nothing' '
+test_expect_success PERL 'saying "n" does nothing' '

        set_and_save_state dir/foo work head &&
        (echo n; echo n) | git checkout -p &&
        verify_saved_state bar &&
        verify_saved_state dir/foo
 '
 
        set_and_save_state dir/foo work head &&
        (echo n; echo n) | git checkout -p &&
        verify_saved_state bar &&
        verify_saved_state dir/foo
 '
 

-test_expect_success 'git checkout -p' '
+test_expect_success PERL 'git checkout -p' '

        (echo n; echo y) | git checkout -p &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 
        (echo n; echo y) | git checkout -p &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 

-test_expect_success 'git checkout -p with staged changes' '
+test_expect_success PERL 'git checkout -p with staged changes' '

        set_state dir/foo work index
        (echo n; echo y) | git checkout -p &&
        verify_saved_state bar &&
        verify_state dir/foo index index
 '
 
        set_state dir/foo work index
        (echo n; echo y) | git checkout -p &&
        verify_saved_state bar &&
        verify_state dir/foo index index
 '
 

-test_expect_success 'git checkout -p HEAD with NO staged changes: abort' '
+test_expect_success PERL 'git checkout -p HEAD with NO staged changes: abort' '

        set_and_save_state dir/foo work head &&
        (echo n; echo y; echo n) | git checkout -p HEAD &&
        verify_saved_state bar &&
        verify_saved_state dir/foo
 '
 
        set_and_save_state dir/foo work head &&
        (echo n; echo y; echo n) | git checkout -p HEAD &&
        verify_saved_state bar &&
        verify_saved_state dir/foo
 '
 

-test_expect_success 'git checkout -p HEAD with NO staged changes: apply' '
+test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' '

        (echo n; echo y; echo y) | git checkout -p HEAD &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 
        (echo n; echo y; echo y) | git checkout -p HEAD &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 

-test_expect_success 'git checkout -p HEAD with change already staged' '
+test_expect_success PERL 'git checkout -p HEAD with change already staged' '

        set_state dir/foo index index
        # the third n is to get out in case it mistakenly does not apply
        (echo n; echo y; echo n) | git checkout -p HEAD &&
        set_state dir/foo index index
        # the third n is to get out in case it mistakenly does not apply
        (echo n; echo y; echo n) | git checkout -p HEAD &&


@@ -59,14 +59,14 @@ test_expect_success 'git checkout -p HEAD with change already staged' '
        verify_state dir/foo head head
 '
 
        verify_state dir/foo head head
 '
 

-test_expect_success 'git checkout -p HEAD^' '
+test_expect_success PERL 'git checkout -p HEAD^' '

        # the third n is to get out in case it mistakenly does not apply
        (echo n; echo y; echo n) | git checkout -p HEAD^ &&
        verify_saved_state bar &&
        verify_state dir/foo parent parent
 '
 
        # the third n is to get out in case it mistakenly does not apply
        (echo n; echo y; echo n) | git checkout -p HEAD^ &&
        verify_saved_state bar &&
        verify_state dir/foo parent parent
 '
 

-test_expect_success 'git checkout -p handles deletion' '
+test_expect_success PERL 'git checkout -p handles deletion' '

        set_state dir/foo work index &&
        rm dir/foo &&
        (echo n; echo y) | git checkout -p &&
        set_state dir/foo work index &&
        rm dir/foo &&
        (echo n; echo y) | git checkout -p &&


@@ -79,28 +79,28 @@ test_expect_success 'git checkout -p handles deletion' '
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
 # the failure case (and thus get out of the loop).
 
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
 # the failure case (and thus get out of the loop).
 

-test_expect_success 'path limiting works: dir' '
+test_expect_success PERL 'path limiting works: dir' '

        set_state dir/foo work head &&
        (echo y; echo n) | git checkout -p dir &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 
        set_state dir/foo work head &&
        (echo y; echo n) | git checkout -p dir &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 

-test_expect_success 'path limiting works: -- dir' '
+test_expect_success PERL 'path limiting works: -- dir' '

        set_state dir/foo work head &&
        (echo y; echo n) | git checkout -p -- dir &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 
        set_state dir/foo work head &&
        (echo y; echo n) | git checkout -p -- dir &&
        verify_saved_state bar &&
        verify_state dir/foo head head
 '
 

-test_expect_success 'path limiting works: HEAD^ -- dir' '
+test_expect_success PERL 'path limiting works: HEAD^ -- dir' '

        # the third n is to get out in case it mistakenly does not apply
        (echo y; echo n; echo n) | git checkout -p HEAD^ -- dir &&
        verify_saved_state bar &&
        verify_state dir/foo parent parent
 '
 
        # the third n is to get out in case it mistakenly does not apply
        (echo y; echo n; echo n) | git checkout -p HEAD^ -- dir &&
        verify_saved_state bar &&
        verify_state dir/foo parent parent
 '
 

-test_expect_success 'path limiting works: foo inside dir' '
+test_expect_success PERL 'path limiting works: foo inside dir' '

        set_state dir/foo work head &&
        # the third n is to get out in case it mistakenly does not apply
        (echo y; echo n; echo n) | (cd dir && git checkout -p foo) &&
        set_state dir/foo work head &&
        # the third n is to get out in case it mistakenly does not apply
        (echo y; echo n; echo n) | (cd dir && git checkout -p foo) &&


@@ -108,7 +108,7 @@ test_expect_success 'path limiting works: foo inside dir' '
        verify_state dir/foo head head
 '
 
        verify_state dir/foo head head
 '
 

-test_expect_success 'none of this moved HEAD' '
+test_expect_success PERL 'none of this moved HEAD' '

        verify_saved_head
 '
 
        verify_saved_head
 '
 

diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index f37e3bc6ec50e680af372a1c1065413aca063bcc..d1819ca23a782eddc61d86c62060242b293b86b0 100755 (executable)
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -3,7 +3,7 @@
 test_description='git checkout --patch'
 . ./lib-patch-mode.sh
 
 test_description='git checkout --patch'
 . ./lib-patch-mode.sh
 

-test_expect_success 'setup' '
+test_expect_success PERL 'setup' '

        mkdir dir &&
        echo parent > dir/foo &&
        echo dummy > bar &&
        mkdir dir &&
        echo parent > dir/foo &&
        echo dummy > bar &&


@@ -19,14 +19,14 @@ test_expect_success 'setup' '
 
 # note: bar sorts before dir, so the first 'n' is always to skip 'bar'
 
 
 # note: bar sorts before dir, so the first 'n' is always to skip 'bar'
 

-test_expect_success 'saying "n" does nothing' '
+test_expect_success PERL 'saying "n" does nothing' '

        set_state dir/foo work index
        (echo n; echo n) | test_must_fail git stash save -p &&
        verify_state dir/foo work index &&
        verify_saved_state bar
 '
 
        set_state dir/foo work index
        (echo n; echo n) | test_must_fail git stash save -p &&
        verify_state dir/foo work index &&
        verify_saved_state bar
 '
 

-test_expect_success 'git stash -p' '
+test_expect_success PERL 'git stash -p' '

        (echo n; echo y) | git stash save -p &&
        verify_state dir/foo head index &&
        verify_saved_state bar &&
        (echo n; echo y) | git stash save -p &&
        verify_state dir/foo head index &&
        verify_saved_state bar &&


@@ -36,7 +36,7 @@ test_expect_success 'git stash -p' '
        verify_state bar dummy dummy
 '
 
        verify_state bar dummy dummy
 '
 

-test_expect_success 'git stash -p --no-keep-index' '
+test_expect_success PERL 'git stash -p --no-keep-index' '

        set_state dir/foo work index &&
        set_state bar bar_work bar_index &&
        (echo n; echo y) | git stash save -p --no-keep-index &&
        set_state dir/foo work index &&
        set_state bar bar_work bar_index &&
        (echo n; echo y) | git stash save -p --no-keep-index &&


@@ -48,7 +48,7 @@ test_expect_success 'git stash -p --no-keep-index' '
        verify_state bar dummy bar_index
 '
 
        verify_state bar dummy bar_index
 '
 

-test_expect_success 'none of this moved HEAD' '
+test_expect_success PERL 'none of this moved HEAD' '

        verify_saved_head
 '
 
        verify_saved_head
 '
 

diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index c1f4fc3c6573b866497352ac9ed3f9e10d650992..4b629f771e062aad6438af2d6fe86941f33e1c10 100755 (executable)
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -41,27 +41,27 @@ test_expect_success 'git reset -p HEAD^' '
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
 # the failure case (and thus get out of the loop).
 
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
 # the failure case (and thus get out of the loop).
 

-test_expect_success 'git reset -p dir' '
+test_expect_success PERL 'git reset -p dir' '

        set_state dir/foo work work
        (echo y; echo n) | git reset -p dir &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 
        set_state dir/foo work work
        (echo y; echo n) | git reset -p dir &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 

-test_expect_success 'git reset -p -- foo (inside dir)' '
+test_expect_success PERL 'git reset -p -- foo (inside dir)' '

        set_state dir/foo work work
        (echo y; echo n) | (cd dir && git reset -p -- foo) &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 
        set_state dir/foo work work
        (echo y; echo n) | (cd dir && git reset -p -- foo) &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 

-test_expect_success 'git reset -p HEAD^ -- dir' '
+test_expect_success PERL 'git reset -p HEAD^ -- dir' '

        (echo y; echo n) | git reset -p HEAD^ -- dir &&
        verify_state dir/foo work parent &&
        verify_saved_state bar
 '
 
        (echo y; echo n) | git reset -p HEAD^ -- dir &&
        verify_state dir/foo work parent &&
        verify_saved_state bar
 '
 

-test_expect_success 'none of this moved HEAD' '
+test_expect_success PERL 'none of this moved HEAD' '

        verify_saved_head
 '
 
        verify_saved_head
 '