diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-06-27 12:00:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 04:06:34 (GMT) |
| commit | 23bd0c99f7b789077c40ae5384dd0054ef5c00ac (patch) | |
| tree | 08d5f2fdd0a1a5ed55df87fffc33f11d1399e369 /t/lib-git-p4.sh | |
| parent | f89f35a9d41535b3e8ebe500489634e623ae8d83 (diff) | |
| download | git-23bd0c99f7b789077c40ae5384dd0054ef5c00ac.zip git-23bd0c99f7b789077c40ae5384dd0054ef5c00ac.tar.gz git-23bd0c99f7b789077c40ae5384dd0054ef5c00ac.tar.bz2 | |
git p4 test: use real_path to resolve p4 client symlinks
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index eea46a4..44ec24d 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" |