diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-13 20:40:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:43:23 -0700 |
| commit | f2f7b6a550008151a1d312b058c853cd7a61f9ab (patch) | |
| tree | fc4cc7cb98983f00a3ab102da86a7b4f3048d144 /t/t3904-stash-patch.sh | |
| parent | f04593199b1e1b91687463e46ad4595280853677 (diff) | |
| download | git-f2f7b6a550008151a1d312b058c853cd7a61f9ab.tar.gz git-f2f7b6a550008151a1d312b058c853cd7a61f9ab.tar.xz | |
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>
Diffstat (limited to 't/t3904-stash-patch.sh')
| -rwxr-xr-x | t/t3904-stash-patch.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index f37e3bc6e..d1819ca23 100755 --- 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_expect_success 'setup' ' +test_expect_success PERL 'setup' ' 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' -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 ' -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 && @@ -36,7 +36,7 @@ test_expect_success 'git stash -p' ' 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 && @@ -48,7 +48,7 @@ test_expect_success 'git stash -p --no-keep-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 ' |