Merge branch 'jk/unused-params-even-more'

diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index 78f1d0f92d9e55641a225bc0cefca69822e17f47..600ce1e0b0d7edf193291a6a25450c92a5888475 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
 '
@@ -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