t/t4004-diff-rename-symlink.sh: use three-arg <prereq>

Change the tests that skipped due to unavailable SYMLINKS support to use the three-arg prereq form of test_expect_success. This is like the "tests: implicitly skip SYMLINKS tests using <prereq>" change, but I needed to create an additional test for some setup code. It's in a separate change as suggested by Jonathan Nieder for ease of reviewing. Date: Tue, 27 Jul 2010 16:17:37 -0500 From: Jonathan Nieder <jrnieder@gmail.com> Message-ID: <20100727211737.GA11768@burratino> In-Reply-To: <1280265254-19642-2-git-send-email-avarab@gmail.com> Subject: Re: [PATCH 1/4] tests: implicitly skip SYMLINKS tests using <prereq> Ævar Arnfjörð Bjarmason wrote: > +++ b/t/t4004-diff-rename-symlink.sh > @@ -40,8 +34,9 @@ test_expect_success \ > # rezrov and nitfol are rename/copy of frotz and bozbar should be > # a new creation. > > -GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current > -cat >expected <<\EOF > +test_expect_success SYMLINKS 'setup diff output' " > + GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current > + cat >expected <<\EOF > diff --git a/bozbar b/bozbar > new file mode 120000 > --- /dev/null Probably belongs in a separate patch. More importantly, it is missing &&-chaining (not a regression, but it is best to set a good example). Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jul 28, 2010 at 10:34 UTC f6c1998f1412ffb31ac69e0c725c5b8d88b0389a

1 file changed +7 -11

t/t4004-diff-rename-symlink.sh

+7 -11

@@ -12,13 +12,7 @@ by an edit for them.

12 . ./test-lib.sh

13 . "$TEST_DIRECTORY"/diff-lib.sh

15 -if ! test_have_prereq SYMLINKS

16 -then

17 - skip_all='Symbolic links not supported, skipping tests.'

18 - test_done

19 -fi

20 -

21 -test_expect_success \

15 +test_expect_success SYMLINKS \

16 'prepare reference tree' \

17 'echo xyzzy | tr -d '\\\\'012 >yomin &&

18 ln -s xyzzy frotz &&

@@ -26,7 +20,7 @@ test_expect_success \

20 tree=$(git write-tree) &&

21 echo $tree'

29 -test_expect_success \

23 +test_expect_success SYMLINKS \

24 'prepare work tree' \

25 'mv frotz rezrov &&

26 rm -f yomin &&

@@ -40,8 +34,9 @@ test_expect_success \

34 # rezrov and nitfol are rename/copy of frotz and bozbar should be

35 # a new creation.

43 -GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current

44 -cat >expected <<\EOF

37 +test_expect_success SYMLINKS 'setup diff output' "

38 + GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&

39 + cat >expected <<\EOF

40 diff --git a/bozbar b/bozbar

41 new file mode 120000

42 --- /dev/null

@@ -65,8 +60,9 @@ deleted file mode 100644

60 -xyzzy

61 \ No newline at end of file

62 EOF

63 +"

69 -test_expect_success \

65 +test_expect_success SYMLINKS \

66 'validate diff output' \

67 'compare_diff_patch current expected'