Imported Upstream version 2.30.0

[platform/upstream/git.git] / t / t9819-git-p4-case-folding.sh

diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index 78f1d0f..b4d93f0 100755 (executable)
--- a/t/t9819-git-p4-case-folding.sh
+++ b/t/t9819-git-p4-case-folding.sh
@@ -4,6 +4,12 @@ test_description='interaction with P4 case-folding'
 
 . ./lib-git-p4.sh
 
+if test_have_prereq CASE_INSENSITIVE_FS
+then
+       skip_all='skipping P4 case-folding tests; case insensitive file system detected'
+       test_done
+fi
+
 test_expect_success 'start p4d with case folding enabled' '
        start_p4d -C1
 '
@@ -24,7 +30,7 @@ test_expect_success 'Check p4 is in case-folding mode' '
                cd "$cli" &&
                >lc/FILE.TXT &&
                p4 add lc/FILE.TXT &&
-               test_must_fail p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT
+               ! p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT
        )
 '
 
@@ -47,8 +53,4 @@ test_expect_failure 'Clone UC repo with lc name' '
        test_must_fail git p4 clone //depot/uc/...
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done