From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: [PATCH 2/9] git p4 test: use real_path to resolve p4 client symlinks
Date: Mon, 25 Jun 2012 21:18:18 -0400 [thread overview]
Message-ID: <1340673505-10551-3-git-send-email-pw@padd.com> (raw)
In-Reply-To: <1340673505-10551-1-git-send-email-pw@padd.com>
The p4 program is finicky about making sure the recorded client Root
matches the current working directory. The way it discovers the latter
seems to be to inspect shell variable $PWD. This could involve symlinks,
that while leading to the same place as the client Root, look different,
and cause p4 to fail.
Resolve all client paths using "test-path-utils real_path $path". This
removes ".." and resolves all symlinks.
Discovered while running with --root=/dev/shm, which is a link to
/run/shm.
Signed-off-by: Pete Wyckoff <pw@padd.com>
---
t/lib-git-p4.sh | 2 +-
t/t9806-git-p4-options.sh | 2 +-
t/t9810-git-p4-rcs.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 0080eae..2693105 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -27,7 +27,7 @@ export P4CLIENT=client
export P4EDITOR=:
db="$TRASH_DIRECTORY/db"
-cli="$TRASH_DIRECTORY/cli"
+cli=$(test-path-utils real_path "$TRASH_DIRECTORY/cli")
git="$TRASH_DIRECTORY/git"
pidfile="$TRASH_DIRECTORY/p4d.pid"
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 2892367..83738fa 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -128,7 +128,7 @@ test_expect_success 'clone --use-client-spec' '
exec >/dev/null &&
test_must_fail git p4 clone --dest="$git" --use-client-spec
) &&
- cli2="$TRASH_DIRECTORY/cli2" &&
+ cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") &&
mkdir -p "$cli2" &&
test_when_finished "rmdir \"$cli2\"" &&
(
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index d8d9ca4..c7313b0 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -244,7 +244,7 @@ test_expect_success 'cope with rcs keyword expansion damage' '
cd "$git" &&
git config git-p4.skipSubmitEdit true &&
git config git-p4.attemptRCSCleanup true &&
- (cd ../cli && p4_append_to_file kwfile1.c) &&
+ (cd "$cli" && p4_append_to_file kwfile1.c) &&
old_lines=$(wc -l <kwfile1.c) &&
perl -n -i -e "print unless m/Revision:/" kwfile1.c &&
new_lines=$(wc -l <kwfile1.c) &&
--
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 ` Pete Wyckoff [this message]
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 ` [PATCH 7/9] git p4 test: copy source indeterminate Pete Wyckoff
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-3-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).