t0050: use the SYMLINKS test prereq

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index df9498b7d0793fd116c69de2b83c89f767d80351..b46ae72eac504619156caf1decc5d7d297492e0b 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -8,7 +8,6 @@ auml=$(printf '\303\244')
 aumlcdiar=$(printf '\141\314\210')
 
 unibad=
 aumlcdiar=$(printf '\141\314\210')
 
 unibad=

-no_symlinks=

 test_expect_success 'see what we expect' '
 
        test_unicode=test_expect_success &&
 test_expect_success 'see what we expect' '
 
        test_unicode=test_expect_success &&


@@ -21,13 +20,7 @@ test_expect_success 'see what we expect' '
                ;;
        *)      ;;
        esac &&
                ;;
        *)      ;;
        esac &&

-       rm -fr junk &&
-       {
-               ln -s x y 2> /dev/null &&
-               test -h y 2> /dev/null ||
-               no_symlinks=1 &&
-               rm -f y
-       }
+       rm -fr junk

 '
 
 if test_have_prereq CASE_INSENSITIVE_FS
 '
 
 if test_have_prereq CASE_INSENSITIVE_FS


@@ -40,7 +33,7 @@ fi
 
 test "$unibad" &&
        say "will test on a unicode corrupting filesystem"
 
 test "$unibad" &&
        say "will test on a unicode corrupting filesystem"

-test "$no_symlinks" &&
+test_have_prereq SYMLINKS ||

        say "will test on a filesystem lacking symbolic links"
 
 if test_have_prereq CASE_INSENSITIVE_FS
        say "will test on a filesystem lacking symbolic links"
 
 if test_have_prereq CASE_INSENSITIVE_FS


@@ -57,18 +50,18 @@ test_expect_success "detection of case insensitive filesystem during repo init"
 '
 fi
 
 '
 fi
 

-if test "$no_symlinks"
+if test_have_prereq SYMLINKS

 then
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
 
 then
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
 

-       v=$(git config --bool core.symlinks) &&
-       test "$v" = false
+       test_must_fail git config --bool core.symlinks ||
+       test "$(git config --bool core.symlinks)" = true

 '
 else
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
 
 '
 else
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
 

-       test_must_fail git config --bool core.symlinks ||
-       test "$(git config --bool core.symlinks)" = true
+       v=$(git config --bool core.symlinks) &&
+       test "$v" = false

 '
 fi
 
 '
 fi