t3100: use test_ln_s_add to remove SYMLINKS prerequisite

This undoes the special casing introduced in this test by 704a3143
(Use prerequisite tags to skip tests that depend on symbolic links,
2009-03-04).

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index 81d90b66c50e75323a44aaf5e2e067d5a3569e6a..eb73c06a4e1ee826684ee84efa134ee5517023a6 100755 (executable)
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -22,20 +22,8 @@ test_expect_success \
     'setup' \
     'mkdir path2 path2/baz &&
      echo Hi >path0 &&
     'setup' \
     'mkdir path2 path2/baz &&
      echo Hi >path0 &&

-     if test_have_prereq SYMLINKS
-     then
-       ln -s path0 path1 &&
-       ln -s ../path1 path2/bazbo
-       make_expected () {
-               cat >expected
-       }
-     else
-       printf path0 > path1 &&
-       printf ../path1 > path2/bazbo
-       make_expected () {
-               sed -e "s/120000 /100644 /" >expected
-       }
-     fi &&
+     test_ln_s_add path0 path1 &&
+     test_ln_s_add ../path1 path2/bazbo &&

      echo Lo >path2/foo &&
      echo Mi >path2/baz/b &&
      find path? \( -type f -o -type l \) -print |
      echo Lo >path2/foo &&
      echo Mi >path2/baz/b &&
      find path? \( -type f -o -type l \) -print |


@@ -51,7 +39,7 @@ test_output () {
 test_expect_success \
     'ls-tree plain' \
     'git ls-tree $tree >current &&
 test_expect_success \
     'ls-tree plain' \
     'git ls-tree $tree >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 100644 blob X  path0
 120000 blob X  path1
 040000 tree X  path2
 100644 blob X  path0
 120000 blob X  path1
 040000 tree X  path2


@@ -61,7 +49,7 @@ EOF
 test_expect_success \
     'ls-tree recursive' \
     'git ls-tree -r $tree >current &&
 test_expect_success \
     'ls-tree recursive' \
     'git ls-tree -r $tree >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 100644 blob X  path0
 120000 blob X  path1
 100644 blob X  path2/baz/b
 100644 blob X  path0
 120000 blob X  path1
 100644 blob X  path2/baz/b


@@ -73,7 +61,7 @@ EOF
 test_expect_success \
     'ls-tree recursive with -t' \
     'git ls-tree -r -t $tree >current &&
 test_expect_success \
     'ls-tree recursive with -t' \
     'git ls-tree -r -t $tree >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 100644 blob X  path0
 120000 blob X  path1
 040000 tree X  path2
 100644 blob X  path0
 120000 blob X  path1
 040000 tree X  path2


@@ -87,7 +75,7 @@ EOF
 test_expect_success \
     'ls-tree recursive with -d' \
     'git ls-tree -r -d $tree >current &&
 test_expect_success \
     'ls-tree recursive with -d' \
     'git ls-tree -r -d $tree >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2
 040000 tree X  path2/baz
 EOF
 040000 tree X  path2
 040000 tree X  path2/baz
 EOF


@@ -96,7 +84,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path' \
     'git ls-tree $tree path >current &&
 test_expect_success \
     'ls-tree filtered with path' \
     'git ls-tree $tree path >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 EOF
      test_output'
 
 EOF
      test_output'
 


@@ -106,7 +94,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path1 path0' \
     'git ls-tree $tree path1 path0 >current &&
 test_expect_success \
     'ls-tree filtered with path1 path0' \
     'git ls-tree $tree path1 path0 >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 100644 blob X  path0
 120000 blob X  path1
 EOF
 100644 blob X  path0
 120000 blob X  path1
 EOF


@@ -115,7 +103,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path0/' \
     'git ls-tree $tree path0/ >current &&
 test_expect_success \
     'ls-tree filtered with path0/' \
     'git ls-tree $tree path0/ >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 EOF
      test_output'
 
 EOF
      test_output'
 


@@ -124,7 +112,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path2' \
     'git ls-tree $tree path2 >current &&
 test_expect_success \
     'ls-tree filtered with path2' \
     'git ls-tree $tree path2 >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2
 EOF
      test_output'
 040000 tree X  path2
 EOF
      test_output'


@@ -133,7 +121,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path2/' \
     'git ls-tree $tree path2/ >current &&
 test_expect_success \
     'ls-tree filtered with path2/' \
     'git ls-tree $tree path2/ >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2/baz
 120000 blob X  path2/bazbo
 100644 blob X  path2/foo
 040000 tree X  path2/baz
 120000 blob X  path2/bazbo
 100644 blob X  path2/foo


@@ -145,7 +133,7 @@ EOF
 test_expect_success \
     'ls-tree filtered with path2/baz' \
     'git ls-tree $tree path2/baz >current &&
 test_expect_success \
     'ls-tree filtered with path2/baz' \
     'git ls-tree $tree path2/baz >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2/baz
 EOF
      test_output'
 040000 tree X  path2/baz
 EOF
      test_output'


@@ -153,14 +141,14 @@ EOF
 test_expect_success \
     'ls-tree filtered with path2/bak' \
     'git ls-tree $tree path2/bak >current &&
 test_expect_success \
     'ls-tree filtered with path2/bak' \
     'git ls-tree $tree path2/bak >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 EOF
      test_output'
 
 test_expect_success \
     'ls-tree -t filtered with path2/bak' \
     'git ls-tree -t $tree path2/bak >current &&
 EOF
      test_output'
 
 test_expect_success \
     'ls-tree -t filtered with path2/bak' \
     'git ls-tree -t $tree path2/bak >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2
 EOF
      test_output'
 040000 tree X  path2
 EOF
      test_output'


@@ -168,7 +156,7 @@ EOF
 test_expect_success \
     'ls-tree with one path a prefix of the other' \
     'git ls-tree $tree path2/baz path2/bazbo >current &&
 test_expect_success \
     'ls-tree with one path a prefix of the other' \
     'git ls-tree $tree path2/baz path2/bazbo >current &&

-     make_expected <<\EOF &&
+     cat >expected <<\EOF &&

 040000 tree X  path2/baz
 120000 blob X  path2/bazbo
 EOF
 040000 tree X  path2/baz
 120000 blob X  path2/bazbo
 EOF