From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: [PATCH 13/21] git p4 test: avoid wildcard * in windows
Date: Fri, 28 Sep 2012 08:04:17 -0400 [thread overview]
Message-ID: <1348833865-6093-14-git-send-email-pw@padd.com> (raw)
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
next prev parent reply other threads:[~2012-09-28 12:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 12:04 [PATCH 00/21] git p4: work on cygwin Pete Wyckoff
2012-09-28 12:04 ` [PATCH 01/21] git p4: temp branch name should use / even on windows Pete Wyckoff
2012-09-28 12:04 ` [PATCH 02/21] git p4: remove unused imports Pete Wyckoff
2012-09-28 12:04 ` [PATCH 03/21] git p4: generate better error message for bad depot path Pete Wyckoff
2012-09-28 18:58 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 04/21] git p4: fix error message when "describe -s" fails Pete Wyckoff
2012-09-28 19:02 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 05/21] git p4 test: use client_view to build the initial client Pete Wyckoff
2012-09-28 19:06 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 06/21] git p4 test: use client_view in t9806 Pete Wyckoff
2012-09-28 19:11 ` Junio C Hamano
2013-01-27 1:51 ` Pete Wyckoff
2012-09-28 12:04 ` [PATCH 07/21] git p4 test: start p4d inside its db dir Pete Wyckoff
2012-09-28 12:04 ` [PATCH 08/21] git p4 test: translate windows paths for cygwin Pete Wyckoff
2012-09-28 12:04 ` [PATCH 09/21] git p4: remove unreachable windows \r\n conversion code Pete Wyckoff
2012-09-28 12:04 ` [PATCH 10/21] git p4: scrub crlf for utf16 files on windows Pete Wyckoff
2012-09-28 12:04 ` [PATCH 11/21] git p4 test: newline handling Pete Wyckoff
2012-09-28 12:04 ` [PATCH 12/21] git p4 test: use LineEnd unix in windows tests too Pete Wyckoff
2012-09-28 12:04 ` Pete Wyckoff [this message]
2012-09-28 12:04 ` [PATCH 14/21] git p4: cygwin p4 client does not mark read-only Pete Wyckoff
2012-09-28 12:04 ` [PATCH 15/21] git p4 test: disable chmod test for cygwin Pete Wyckoff
2012-09-28 19:33 ` Johannes Sixt
2012-09-28 12:04 ` [PATCH 16/21] git p4: disable read-only attribute before deleting Pete Wyckoff
2012-09-28 12:04 ` [PATCH 17/21] git p4: avoid shell when mapping users Pete Wyckoff
2012-09-28 12:04 ` [PATCH 18/21] git p4: avoid shell when invoking git rev-list Pete Wyckoff
2012-09-28 12:04 ` [PATCH 19/21] git p4: avoid shell when invoking git config --get-all Pete Wyckoff
2012-09-28 12:04 ` [PATCH 20/21] git p4: avoid shell when calling git config Pete Wyckoff
2012-09-28 12:04 ` [PATCH 21/21] git p4: introduce gitConfigBool Pete Wyckoff
2012-09-28 19:17 ` [PATCH 00/21] git p4: work on cygwin Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348833865-6093-14-git-send-email-pw@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).