git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 13/21] git p4 test: avoid wildcard * in windows

From
PWPete Wyckoff <pw@padd.com>
Date
Sep 28, 2012, 12:04 UTC
Message-ID
<1348833865-6093-14-git-send-email-pw@padd.com>
In-Reply-To
<1348833865-6093-1-git-send-email-pw@padd.com>

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>
---
 t/t9809-git-p4-client-view.sh | 10 ++++++++--
 t/t9812-git-p4-wildcards.sh   | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 281be29..fd8fa89 100755
--- 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 143d413..6763325 100755
--- 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
 	)

-- 
1.7.12.1.403.g28165e1
Previous: Pete WyckoffNext: Pete Wyckoff
Message 19 of 29 in “git p4: work on cygwin”
  1. 00/21 git p4: work on cygwinPete Wyckoff, Sep 28, 2012
  2. 01/21 git p4: temp branch name should use / even on windowsPete Wyckoff, Sep 28, 2012
  3. 02/21 git p4: remove unused importsPete Wyckoff, Sep 28, 2012
  4. 03/21 git p4: generate better error message for bad depot pathPete Wyckoff, Sep 28, 2012
  5. Junio C HamanoSep 28, 2012
  6. 04/21 git p4: fix error message when "describe -s" failsPete Wyckoff, Sep 28, 2012
  7. Junio C HamanoSep 28, 2012
  8. 05/21 git p4 test: use client_view to build the initial clientPete Wyckoff, Sep 28, 2012
  9. Junio C HamanoSep 28, 2012
  10. 06/21 git p4 test: use client_view in t9806Pete Wyckoff, Sep 28, 2012
  11. Junio C HamanoSep 28, 2012
  12. Pete WyckoffJan 27, 2013
  13. 07/21 git p4 test: start p4d inside its db dirPete Wyckoff, Sep 28, 2012
  14. 08/21 git p4 test: translate windows paths for cygwinPete Wyckoff, Sep 28, 2012
  15. 09/21 git p4: remove unreachable windows \r\n conversion codePete Wyckoff, Sep 28, 2012
  16. 10/21 git p4: scrub crlf for utf16 files on windowsPete Wyckoff, Sep 28, 2012
  17. 11/21 git p4 test: newline handlingPete Wyckoff, Sep 28, 2012
  18. 12/21 git p4 test: use LineEnd unix in windows tests tooPete Wyckoff, Sep 28, 2012
  19. 13/21 git p4 test: avoid wildcard * in windowsPete Wyckoff, Sep 28, 2012
  20. 14/21 git p4: cygwin p4 client does not mark read-onlyPete Wyckoff, Sep 28, 2012
  21. 15/21 git p4 test: disable chmod test for cygwinPete Wyckoff, Sep 28, 2012
  22. Johannes SixtSep 28, 2012
  23. 16/21 git p4: disable read-only attribute before deletingPete Wyckoff, Sep 28, 2012
  24. 17/21 git p4: avoid shell when mapping usersPete Wyckoff, Sep 28, 2012
  25. 18/21 git p4: avoid shell when invoking git rev-listPete Wyckoff, Sep 28, 2012
  26. 19/21 git p4: avoid shell when invoking git config --get-allPete Wyckoff, Sep 28, 2012
  27. 20/21 git p4: avoid shell when calling git configPete Wyckoff, Sep 28, 2012
  28. 21/21 git p4: introduce gitConfigBoolPete Wyckoff, Sep 28, 2012
  29. Junio C HamanoSep 28, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.