From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: [PATCH 7/9] git p4 test: copy source indeterminate
Date: Mon, 25 Jun 2012 21:18:23 -0400 [thread overview]
Message-ID: <1340673505-10551-8-git-send-email-pw@padd.com> (raw)
In-Reply-To: <1340673505-10551-1-git-send-email-pw@padd.com>
Msysgit testing showed that the source file found by copy
detection is indeterminate when there are multiple sources
to choose from. This appears to be valid. Adjust the test
so that it passes if it finds any of the potential copy sources.
Signed-off-by: Pete Wyckoff <pw@padd.com>
---
t/t9800-git-p4-basic.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 84676a1..60c1f57 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -547,7 +547,7 @@ test_expect_success 'detect copies' '
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 &&
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
- test "$src" = file10 &&
+ test "$src" = file10 -o "$src" = file11 &&
git config git-p4.detectCopies $(($level + 2)) &&
git p4 submit &&
p4 filelog //depot/file12 &&
@@ -561,7 +561,7 @@ test_expect_success 'detect copies' '
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 &&
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
- test "$src" = file10 &&
+ test "$src" = file10 -o "$src" = file11 -o "$src" = file12 &&
git config git-p4.detectCopies $(($level - 2)) &&
git p4 submit &&
p4 filelog //depot/file13 &&
--
1.7.11.rc2.72.gebb7ee5
next prev parent reply other threads:[~2012-06-26 1:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-26 1:18 [PATCH 0/9] git p4 test fixes Pete Wyckoff
2012-06-26 1:18 ` [PATCH 1/9] git p4 test: wait longer for p4d to start Pete Wyckoff
2012-06-26 3:46 ` Junio C Hamano
2012-06-26 1:18 ` [PATCH 2/9] git p4 test: use real_path to resolve p4 client symlinks Pete Wyckoff
2012-06-26 1:18 ` [PATCH 3/9] git p4 test: simplify quoting involving TRASH_DIRECTORY Pete Wyckoff
2012-06-26 6:24 ` Johannes Sixt
2012-06-26 16:26 ` Junio C Hamano
2012-06-26 17:10 ` Pete Wyckoff
2012-06-26 1:18 ` [PATCH 4/9] git p4 test: never create default test repo Pete Wyckoff
2012-06-26 1:18 ` [PATCH 5/9] git p4 test: rename some "git-p4 command" strings Pete Wyckoff
2012-06-26 1:18 ` [PATCH 6/9] git p4 test: check for error message in failed test Pete Wyckoff
2012-06-26 1:18 ` Pete Wyckoff [this message]
2012-06-26 1:18 ` [PATCH 8/9] git p4 test: cleanup_git should make a new $git Pete Wyckoff
2012-06-26 1:18 ` [PATCH 9/9] git p4 test: split up big t9800 test Pete Wyckoff
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340673505-10551-8-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.
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 NNTP newsgroup(s).