tests: implicitly skip SYMLINKS tests using <prereq>

Change the tests that skipped due to unavailable SYMLINKS support to
use the three-arg prereq form of test_expect_success.

Now we get an indication of how many tests that need symlinks are
being skipped on platforms that don't support them.

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

diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index 05cc8fdd0168d33d0fe6f2ca54aa4162a0c6cdd0..a74ee227b80391b7d8e2b86159a8374663cb674d 100755 (executable)
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -6,13 +6,7 @@ test_description='git checkout to switch between branches with symlink<->dir'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all="symbolic links not supported - skipping tests"
-       test_done
-fi
-
-test_expect_success setup '
+test_expect_success SYMLINKS setup '

 
        mkdir frotz &&
        echo hello >frotz/filfre &&
 
        mkdir frotz &&
        echo hello >frotz/filfre &&


@@ -38,18 +32,18 @@ test_expect_success setup '
 
 '
 
 
 '
 

-test_expect_success 'switch from symlink to dir' '
+test_expect_success SYMLINKS 'switch from symlink to dir' '

 
        git checkout master
 
 '
 
 
        git checkout master
 
 '
 

-test_expect_success 'Remove temporary directories & switch to master' '
+test_expect_success SYMLINKS 'Remove temporary directories & switch to master' '

        rm -fr frotz xyzzy nitfol &&
        git checkout -f master
 '
 
        rm -fr frotz xyzzy nitfol &&
        git checkout -f master
 '
 

-test_expect_success 'switch from dir to symlink' '
+test_expect_success SYMLINKS 'switch from dir to symlink' '

 
        git checkout side
 
 
        git checkout side
 

diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 918a21a2f41caf2e8ed6bb6120631ff0e4ccb0fc..6f6948925fed1b99f37ec94dd7e4aa2075eb6bb7 100755 (executable)
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -9,12 +9,6 @@ test_description='Test diff of symlinks.
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-

 cat > expected << EOF
 diff --git a/frotz b/frotz
 new file mode 120000
 cat > expected << EOF
 diff --git a/frotz b/frotz
 new file mode 120000


@@ -26,7 +20,7 @@ index 0000000..7c465af
 \ No newline at end of file
 EOF
 
 \ No newline at end of file
 EOF
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff new symlink' \
     'ln -s xyzzy frotz &&
     git update-index &&
     'diff new symlink' \
     'ln -s xyzzy frotz &&
     git update-index &&


@@ -35,7 +29,7 @@ test_expect_success \
     GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree > current &&
     compare_diff_patch current expected'
 
     GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree > current &&
     compare_diff_patch current expected'
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff unchanged symlink' \
     'tree=$(git write-tree) &&
     git update-index frotz &&
     'diff unchanged symlink' \
     'tree=$(git write-tree) &&
     git update-index frotz &&


@@ -52,7 +46,7 @@ index 7c465af..0000000
 \ No newline at end of file
 EOF
 
 \ No newline at end of file
 EOF
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff removed symlink' \
     'mv frotz frotz2 &&
     git diff-index -M -p $tree > current &&
     'diff removed symlink' \
     'mv frotz frotz2 &&
     git diff-index -M -p $tree > current &&


@@ -62,7 +56,7 @@ cat > expected << EOF
 diff --git a/frotz b/frotz
 EOF
 
 diff --git a/frotz b/frotz
 EOF
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff identical, but newly created symlink' \
     'ln -s xyzzy frotz &&
     git diff-index -M -p $tree > current &&
     'diff identical, but newly created symlink' \
     'ln -s xyzzy frotz &&
     git diff-index -M -p $tree > current &&


@@ -80,14 +74,14 @@ index 7c465af..df1db54 120000
 \ No newline at end of file
 EOF
 
 \ No newline at end of file
 EOF
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff different symlink' \
     'rm frotz &&
     ln -s yxyyz frotz &&
     git diff-index -M -p $tree > current &&
     compare_diff_patch current expected'
 
     'diff different symlink' \
     'rm frotz &&
     ln -s yxyyz frotz &&
     git diff-index -M -p $tree > current &&
     compare_diff_patch current expected'
 

-test_expect_success \
+test_expect_success SYMLINKS \

     'diff symlinks with non-existing targets' \
     'ln -s narf pinky &&
     ln -s take\ over brain &&
     'diff symlinks with non-existing targets' \
     'ln -s narf pinky &&
     ln -s take\ over brain &&

diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 40a95a149e4e84924d961d43f03115f466a9acc1..5d20acf436558da6c11214f431beb503bc89459a 100755 (executable)
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -4,13 +4,7 @@ test_description='typechange rename detection'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-
-test_expect_success setup '
+test_expect_success SYMLINKS setup '

 
        rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >foo &&
 
        rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >foo &&


@@ -56,7 +50,7 @@ test_expect_success setup '
 
 '
 
 
 '
 

-test_expect_success 'cross renames to be detected for regular files' '
+test_expect_success SYMLINKS 'cross renames to be detected for regular files' '

 
        git diff-tree five six -r --name-status -B -M | sort >actual &&
        {
 
        git diff-tree five six -r --name-status -B -M | sort >actual &&
        {


@@ -67,7 +61,7 @@ test_expect_success 'cross renames to be detected for regular files' '
 
 '
 
 
 '
 

-test_expect_success 'cross renames to be detected for typechange' '
+test_expect_success SYMLINKS 'cross renames to be detected for typechange' '

 
        git diff-tree one two -r --name-status -B -M | sort >actual &&
        {
 
        git diff-tree one two -r --name-status -B -M | sort >actual &&
        {


@@ -78,7 +72,7 @@ test_expect_success 'cross renames to be detected for typechange' '
 
 '
 
 
 '
 

-test_expect_success 'moves and renames' '
+test_expect_success SYMLINKS 'moves and renames' '

 
        git diff-tree three four -r --name-status -B -M | sort >actual &&
        {
 
        git diff-tree three four -r --name-status -B -M | sort >actual &&
        {

diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index 164d58c222088bd42becf07c044f51bf23eda8b6..f12826fb09729d5753f3f6c9511dab5062f0aae1 100755 (executable)
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -9,13 +9,7 @@ test_description='git apply should not get confused with type changes.
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-
-test_expect_success 'setup repository and commits' '
+test_expect_success SYMLINKS 'setup repository and commits' '

        echo "hello world" > foo &&
        echo "hi planet" > bar &&
        git update-index --add foo bar &&
        echo "hello world" > foo &&
        echo "hi planet" > bar &&
        git update-index --add foo bar &&


@@ -48,7 +42,7 @@ test_expect_success 'setup repository and commits' '
        git branch foo-baz-renamed-from-foo
        '
 
        git branch foo-baz-renamed-from-foo
        '
 

-test_expect_success 'file renamed from foo to foo/baz' '
+test_expect_success SYMLINKS 'file renamed from foo to foo/baz' '

        git checkout -f initial &&
        git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
        git apply --index < patch
        git checkout -f initial &&
        git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
        git apply --index < patch


@@ -56,7 +50,7 @@ test_expect_success 'file renamed from foo to foo/baz' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'file renamed from foo/baz to foo' '
+test_expect_success SYMLINKS 'file renamed from foo/baz to foo' '

        git checkout -f foo-baz-renamed-from-foo &&
        git diff-tree -M -p HEAD initial > patch &&
        git apply --index < patch
        git checkout -f foo-baz-renamed-from-foo &&
        git diff-tree -M -p HEAD initial > patch &&
        git apply --index < patch


@@ -64,7 +58,7 @@ test_expect_success 'file renamed from foo/baz to foo' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'directory becomes file' '
+test_expect_success SYMLINKS 'directory becomes file' '

        git checkout -f foo-becomes-a-directory &&
        git diff-tree -p HEAD initial > patch &&
        git apply --index < patch
        git checkout -f foo-becomes-a-directory &&
        git diff-tree -p HEAD initial > patch &&
        git apply --index < patch


@@ -72,7 +66,7 @@ test_expect_success 'directory becomes file' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'file becomes directory' '
+test_expect_success SYMLINKS 'file becomes directory' '

        git checkout -f initial &&
        git diff-tree -p HEAD foo-becomes-a-directory > patch &&
        git apply --index < patch
        git checkout -f initial &&
        git diff-tree -p HEAD foo-becomes-a-directory > patch &&
        git apply --index < patch


@@ -80,7 +74,7 @@ test_expect_success 'file becomes directory' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'file becomes symlink' '
+test_expect_success SYMLINKS 'file becomes symlink' '

        git checkout -f initial &&
        git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch
        git checkout -f initial &&
        git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch


@@ -88,21 +82,21 @@ test_expect_success 'file becomes symlink' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'symlink becomes file' '
+test_expect_success SYMLINKS 'symlink becomes file' '

        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p HEAD foo-back-to-file > patch &&
        git apply --index < patch
        '
 test_debug 'cat patch'
 
        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p HEAD foo-back-to-file > patch &&
        git apply --index < patch
        '
 test_debug 'cat patch'
 

-test_expect_success 'binary file becomes symlink' '
+test_expect_success SYMLINKS 'binary file becomes symlink' '

        git checkout -f foo-becomes-binary &&
        git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch
        '
 test_debug 'cat patch'
 
        git checkout -f foo-becomes-binary &&
        git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch
        '
 test_debug 'cat patch'
 

-test_expect_success 'symlink becomes binary file' '
+test_expect_success SYMLINKS 'symlink becomes binary file' '

        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
        git apply --index < patch
        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
        git apply --index < patch


@@ -110,7 +104,7 @@ test_expect_success 'symlink becomes binary file' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'symlink becomes directory' '
+test_expect_success SYMLINKS 'symlink becomes directory' '

        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p HEAD foo-becomes-a-directory > patch &&
        git apply --index < patch
        git checkout -f foo-symlinked-to-bar &&
        git diff-tree -p HEAD foo-becomes-a-directory > patch &&
        git apply --index < patch


@@ -118,7 +112,7 @@ test_expect_success 'symlink becomes directory' '
 test_debug 'cat patch'
 
 
 test_debug 'cat patch'
 
 

-test_expect_success 'directory becomes symlink' '
+test_expect_success SYMLINKS 'directory becomes symlink' '

        git checkout -f foo-becomes-a-directory &&
        git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch
        git checkout -f foo-becomes-a-directory &&
        git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
        git apply --index < patch

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index aff4348034b21644818fb8f938ef006001b0b099..7674dd2ec9d6f14a0f2181ebf415378521f90fa4 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -9,13 +9,7 @@ test_description='git apply symlinks and partial files
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-
-test_expect_success setup '
+test_expect_success SYMLINKS setup '

 
        ln -s path1/path2/path3/path4/path5 link1 &&
        git add link? &&
 
        ln -s path1/path2/path3/path4/path5 link1 &&
        git add link? &&


@@ -34,7 +28,7 @@ test_expect_success setup '
 
 '
 
 
 '
 

-test_expect_success 'apply symlink patch' '
+test_expect_success SYMLINKS 'apply symlink patch' '

 
        git checkout side &&
        git apply patch &&
 
        git checkout side &&
        git apply patch &&


@@ -43,7 +37,7 @@ test_expect_success 'apply symlink patch' '
 
 '
 
 
 '
 

-test_expect_success 'apply --index symlink patch' '
+test_expect_success SYMLINKS 'apply --index symlink patch' '

 
        git checkout -f side &&
        git apply --index patch &&
 
        git checkout -f side &&
        git apply --index patch &&

diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 923fcab7f96a76ee7038bfcb20b1270565bc2230..39407376ba7da1cb8256bcd3041a83147cd9eee5 100755 (executable)
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -3,12 +3,6 @@
 test_description='apply to deeper directory without getting fooled with symlink'
 . ./test-lib.sh
 
 test_description='apply to deeper directory without getting fooled with symlink'
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-

 lecho () {
        for l_
        do
 lecho () {
        for l_
        do


@@ -16,7 +10,7 @@ lecho () {
        done
 }
 
        done
 }
 

-test_expect_success setup '
+test_expect_success SYMLINKS setup '

 
        mkdir -p arch/i386/boot arch/x86_64 &&
        lecho 1 2 3 4 5 >arch/i386/boot/Makefile &&
 
        mkdir -p arch/i386/boot arch/x86_64 &&
        lecho 1 2 3 4 5 >arch/i386/boot/Makefile &&


@@ -37,7 +31,7 @@ test_expect_success setup '
 
 '
 
 
 '
 

-test_expect_success apply '
+test_expect_success SYMLINKS apply '

 
        git checkout test &&
        git diff --exit-code test &&
 
        git checkout test &&
        git diff --exit-code test &&


@@ -46,7 +40,7 @@ test_expect_success apply '
 
 '
 
 
 '
 

-test_expect_success 'check result' '
+test_expect_success SYMLINKS 'check result' '

 
        git diff --exit-code master &&
        git diff --exit-code --cached master &&
 
        git diff --exit-code master &&
        git diff --exit-code --cached master &&

diff --git a/t/t5522-pull-symlink.sh b/t/t5522-pull-symlink.sh
index 298200fa4cafc61b5f16f9337314a2b887593a36..8e9b204e02a3d204af08463d2229ca0f319cdc42 100755 (executable)
--- a/t/t5522-pull-symlink.sh
+++ b/t/t5522-pull-symlink.sh
@@ -4,12 +4,6 @@ test_description='pulling from symlinked subdir'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-

 # The scenario we are building:
 #
 #   trash\ directory/
 # The scenario we are building:
 #
 #   trash\ directory/


@@ -20,7 +14,7 @@ fi
 #
 # The working directory is subdir-link.
 
 #
 # The working directory is subdir-link.
 

-test_expect_success setup '
+test_expect_success SYMLINKS setup '

        mkdir subdir &&
        echo file >subdir/file &&
        git add subdir/file &&
        mkdir subdir &&
        echo file >subdir/file &&
        git add subdir/file &&


@@ -36,7 +30,7 @@ test_expect_success setup '
 
 # Demonstrate that things work if we just avoid the symlink
 #
 
 # Demonstrate that things work if we just avoid the symlink
 #

-test_expect_success 'pulling from real subdir' '
+test_expect_success SYMLINKS 'pulling from real subdir' '

        (
                echo real >subdir/file &&
                git commit -m real subdir/file &&
        (
                echo real >subdir/file &&
                git commit -m real subdir/file &&


@@ -64,7 +58,7 @@ test_expect_success 'pulling from real subdir' '
 # directory.  A POSIX shell's "cd" works a little differently
 # than chdir() in C; "cd -P" is much closer to chdir().
 #
 # directory.  A POSIX shell's "cd" works a little differently
 # than chdir() in C; "cd -P" is much closer to chdir().
 #

-test_expect_success 'pulling from symlinked subdir' '
+test_expect_success SYMLINKS 'pulling from symlinked subdir' '

        (
                echo link >subdir/file &&
                git commit -m link subdir/file &&
        (
                echo link >subdir/file &&
                git commit -m link subdir/file &&


@@ -77,7 +71,7 @@ test_expect_success 'pulling from symlinked subdir' '
 # Prove that the remote end really is a repo, and other commands
 # work fine in this context.  It's just that "git pull" breaks.
 #
 # Prove that the remote end really is a repo, and other commands
 # work fine in this context.  It's just that "git pull" breaks.
 #

-test_expect_success 'pushing from symlinked subdir' '
+test_expect_success SYMLINKS 'pushing from symlinked subdir' '

        (
                cd subdir-link/ &&
                echo push >file &&
        (
                cd subdir-link/ &&
                echo push >file &&

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index cd3190c4a61f0404491b41a1b22f5143b63f4992..28e8f2ae6104faf98519d0312fe38db93d77eb85 100755 (executable)
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -3,13 +3,7 @@
 test_description='merging when a directory was replaced with a symlink'
 . ./test-lib.sh
 
 test_description='merging when a directory was replaced with a symlink'
 . ./test-lib.sh
 

-if ! test_have_prereq SYMLINKS
-then
-       skip_all='Symbolic links not supported, skipping tests.'
-       test_done
-fi
-
-test_expect_success 'create a commit where dir a/b changed to symlink' '
+test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' '

        mkdir -p a/b/c a/b-2/c &&
        > a/b/c/d &&
        > a/b-2/c/d &&
        mkdir -p a/b/c a/b-2/c &&
        > a/b/c/d &&
        > a/b-2/c/d &&


@@ -23,7 +17,7 @@ test_expect_success 'create a commit where dir a/b changed to symlink' '
        git commit -m "dir to symlink"
 '
 
        git commit -m "dir to symlink"
 '
 

-test_expect_success 'keep a/b-2/c/d across checkout' '
+test_expect_success SYMLINKS 'keep a/b-2/c/d across checkout' '

        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&
        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&


@@ -32,14 +26,14 @@ test_expect_success 'keep a/b-2/c/d across checkout' '
         test -f a/b-2/c/d
 '
 
         test -f a/b-2/c/d
 '
 

-test_expect_success 'checkout should not have deleted a/b-2/c/d' '
+test_expect_success SYMLINKS 'checkout should not have deleted a/b-2/c/d' '

        git checkout HEAD^0 &&
        git reset --hard master &&
         git checkout start^0 &&
         test -f a/b-2/c/d
 '
 
        git checkout HEAD^0 &&
        git reset --hard master &&
         git checkout start^0 &&
         test -f a/b-2/c/d
 '
 

-test_expect_success 'setup for merge test' '
+test_expect_success SYMLINKS 'setup for merge test' '

        git reset --hard &&
        test -f a/b-2/c/d &&
        echo x > a/x &&
        git reset --hard &&
        test -f a/b-2/c/d &&
        echo x > a/x &&


@@ -48,7 +42,7 @@ test_expect_success 'setup for merge test' '
        git tag baseline
 '
 
        git tag baseline
 '
 

-test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success SYMLINKS 'do not lose a/b-2/c/d in merge (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&


@@ -64,7 +58,7 @@ test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' '
        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
+test_expect_success SYMLINKS 'setup a merge where dir a/b-2 changed to symlink' '

        git reset --hard &&
        git checkout start^0 &&
        rm -rf a/b-2 &&
        git reset --hard &&
        git checkout start^0 &&
        rm -rf a/b-2 &&


@@ -74,7 +68,7 @@ test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
        git tag test2
 '
 
        git tag test2
 '
 

-test_expect_success 'merge should not have conflicts (resolve)' '
+test_expect_success SYMLINKS 'merge should not have conflicts (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve test2 &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve test2 &&