t0050: use the CASE_INSENSITIVE_FS 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 1542cf6a1313963fccdf42702c620be9e05f7143..df9498b7d0793fd116c69de2b83c89f767d80351 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -7,23 +7,12 @@ test_description='Various filesystem issues'
 auml=$(printf '\303\244')
 aumlcdiar=$(printf '\141\314\210')
 
 auml=$(printf '\303\244')
 aumlcdiar=$(printf '\141\314\210')
 

-case_insensitive=

 unibad=
 no_symlinks=
 test_expect_success 'see what we expect' '
 
 unibad=
 no_symlinks=
 test_expect_success 'see what we expect' '
 

-       test_case=test_expect_success &&

        test_unicode=test_expect_success &&
        mkdir junk &&
        test_unicode=test_expect_success &&
        mkdir junk &&

-       echo good >junk/CamelCase &&
-       echo bad >junk/camelcase &&
-       if test "$(cat junk/CamelCase)" != good
-       then
-               test_case=test_expect_failure &&
-               case_insensitive=t
-       fi &&
-       rm -fr junk &&
-       mkdir junk &&

        >junk/"$auml" &&
        case "$(cd junk && echo *)" in
        "$aumlcdiar")
        >junk/"$auml" &&
        case "$(cd junk && echo *)" in
        "$aumlcdiar")


@@ -41,14 +30,20 @@ test_expect_success 'see what we expect' '
        }
 '
 
        }
 '
 

-test "$case_insensitive" &&
+if test_have_prereq CASE_INSENSITIVE_FS
+then

        say "will test on a case insensitive filesystem"
        say "will test on a case insensitive filesystem"

+       test_case=test_expect_failure
+else
+       test_case=test_expect_success
+fi
+

 test "$unibad" &&
        say "will test on a unicode corrupting filesystem"
 test "$no_symlinks" &&
        say "will test on a filesystem lacking symbolic links"
 
 test "$unibad" &&
        say "will test on a unicode corrupting filesystem"
 test "$no_symlinks" &&
        say "will test on a filesystem lacking symbolic links"
 

-if test "$case_insensitive"
+if test_have_prereq CASE_INSENSITIVE_FS

 then
 test_expect_success "detection of case insensitive filesystem during repo init" '
 
 then
 test_expect_success "detection of case insensitive filesystem during repo init" '