git p4 test: avoid wildcard * in windows

This character is not valid in windows filenames, even though
it can appear in p4 depot paths.  Avoid using it in tests on
windows, both mingw and cygwin.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 0b58fb96f097dee7cd4d139269698e8dde4a81c3..a9119889ffe42780e2dd23dfb619c8cf27dc9053 100755 (executable)
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -365,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* &&
@@ -376,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
        ) &&

diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh
index 143d41305785090837bcd233cf67f0d57dfcff44..67633257f3fccb2408d678759bce87f7a58acd0a 100755 (executable)
--- a/t/t9812-git-p4-wildcards.sh
+++ b/t/t9812-git-p4-wildcards.sh
@@ -14,7 +14,10 @@ test_expect_success 'add p4 files with wildcards in the names' '
                printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
                p4 add file2 &&
                echo file-wild-hash >file-wild#hash &&
-               echo file-wild-star >file-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       echo file-wild-star >file-wild\*star
+               fi &&
                echo file-wild-at >file-wild@at &&
                echo file-wild-percent >file-wild%percent &&
                p4 add -f file-wild* &&
@@ -28,7 +31,10 @@ test_expect_success 'wildcard files git p4 clone' '
        (
                cd "$git" &&
                test -f file-wild#hash &&
-               test -f file-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test -f file-wild\*star
+               fi &&
                test -f file-wild@at &&
                test -f file-wild%percent
        )
@@ -40,7 +46,10 @@ test_expect_success 'wildcard files submit back to p4, add' '
        (
                cd "$git" &&
                echo git-wild-hash >git-wild#hash &&
-               echo git-wild-star >git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       echo git-wild-star >git-wild\*star
+               fi &&
                echo git-wild-at >git-wild@at &&
                echo git-wild-percent >git-wild%percent &&
                git add git-wild* &&
@@ -51,7 +60,10 @@ test_expect_success 'wildcard files submit back to p4, add' '
        (
                cd "$cli" &&
                test_path_is_file git-wild#hash &&
-               test_path_is_file git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test_path_is_file git-wild\*star
+               fi &&
                test_path_is_file git-wild@at &&
                test_path_is_file git-wild%percent
        )
@@ -63,7 +75,10 @@ test_expect_success 'wildcard files submit back to p4, modify' '
        (
                cd "$git" &&
                echo new-line >>git-wild#hash &&
-               echo new-line >>git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       echo new-line >>git-wild\*star
+               fi &&
                echo new-line >>git-wild@at &&
                echo new-line >>git-wild%percent &&
                git add git-wild* &&
@@ -74,7 +89,10 @@ test_expect_success 'wildcard files submit back to p4, modify' '
        (
                cd "$cli" &&
                test_line_count = 2 git-wild#hash &&
-               test_line_count = 2 git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test_line_count = 2 git-wild\*star
+               fi &&
                test_line_count = 2 git-wild@at &&
                test_line_count = 2 git-wild%percent
        )
@@ -87,7 +105,7 @@ test_expect_success 'wildcard files submit back to p4, copy' '
                cd "$git" &&
                cp file2 git-wild-cp#hash &&
                git add git-wild-cp#hash &&
-               cp git-wild\*star file-wild-3 &&
+               cp git-wild#hash file-wild-3 &&
                git add file-wild-3 &&
                git commit -m "wildcard copies" &&
                git config git-p4.detectCopies true &&
@@ -134,7 +152,10 @@ test_expect_success 'wildcard files submit back to p4, delete' '
        (
                cd "$cli" &&
                test_path_is_missing git-wild#hash &&
-               test_path_is_missing git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test_path_is_missing git-wild\*star
+               fi &&
                test_path_is_missing git-wild@at &&
                test_path_is_missing git-wild%percent
        )