Merge branch 'rt/commit-cleanup-config'

diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 7d993ef80acdf1775d70713d2b9abfb984c47c1e..77f63492d90e61500e6665ba447fbbad7a8c7b3b 100755 (executable)
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -8,23 +8,6 @@ test_expect_success 'start p4d' '
        start_p4d
 '
 
-#
-# Construct a client with this list of View lines
-#
-client_view() {
-       (
-               cat <<-EOF &&
-               Client: client
-               Description: client
-               Root: $cli
-               View:
-               EOF
-               for arg ; do
-                       printf "\t$arg\n"
-               done
-       ) | p4 client -i
-}
-
 #
 # Verify these files exist, exactly.  Caller creates
 # a list of files in file "files".
@@ -213,7 +196,7 @@ test_expect_success 'exclusion single file' '
 
 test_expect_success 'overlay wildcard' '
        client_view "//depot/dir1/... //client/cli/..." \
-                   "+//depot/dir2/... //client/cli/...\n" &&
+                   "+//depot/dir2/... //client/cli/..." &&
        files="cli/file11 cli/file12 cli/file21 cli/file22" &&
        client_verify $files &&
        test_when_finished cleanup_git &&
@@ -350,7 +333,7 @@ test_expect_success 'subdir clone, submit copy' '
        (
                cd "$cli" &&
                test_path_is_file dir1/file11a &&
-               test ! -w dir1/file11a
+               ! is_cli_file_writeable dir1/file11a
        )
 '
 
@@ -370,7 +353,7 @@ test_expect_success 'subdir clone, submit rename' '
                cd "$cli" &&
                test_path_is_missing dir1/file13 &&
                test_path_is_file dir1/file13a &&
-               test ! -w dir1/file13a
+               ! is_cli_file_writeable dir1/file13a
        )
 '
 
@@ -382,7 +365,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$git" &&
                echo git-wild-hash >dir1/git-wild#hash &&
-               echo git-wild-star >dir1/git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       echo git-wild-star >dir1/git-wild\*star
+               fi &&
                echo git-wild-at >dir1/git-wild@at &&
                echo git-wild-percent >dir1/git-wild%percent &&
                git add dir1/git-wild* &&
@@ -393,7 +379,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$cli" &&
                test_path_is_file dir1/git-wild#hash &&
-               test_path_is_file dir1/git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test_path_is_file dir1/git-wild\*star
+               fi &&
                test_path_is_file dir1/git-wild@at &&
                test_path_is_file dir1/git-wild%percent
        ) &&