Skip to content

Commit

Permalink
git p4 test: make sure P4CONFIG relative path works
Browse files Browse the repository at this point in the history
This adds a test for the fix in bf1d68f (git-p4: use absolute
directory for PWD env var, 2011-12-09).  It is necessary to
set PWD to an absolute path so that p4 can find files referenced
by non-absolute paths, like the value of the P4CONFIG environment
variable.

P4 does not open files directly; it builds a path by prepending
the contents of the PWD environment variable.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Pete Wyckoff authored and Junio C Hamano committed Mar 8, 2013
1 parent aadb70a commit 9e7b8ef
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions t/t9808-git-p4-chdir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,20 @@ test_expect_success 'P4CONFIG and relative dir clone' '
)
'

# Common setup using .p4config to set P4CLIENT and P4PORT breaks
# if clone destination is relative. Make sure that chdir() expands
# the relative path in --dest to absolute.
test_expect_success 'p4 client root would be relative due to clone --dest' '
test_when_finished cleanup_git &&
(
echo P4PORT=$P4PORT >git/.p4config &&
P4CONFIG=.p4config &&
export P4CONFIG &&
unset P4PORT &&
git p4 clone --dest="git" //depot
)
'

test_expect_success 'kill p4d' '
kill_p4d
'
Expand Down

0 comments on commit 9e7b8ef

Please sign in to comment.