[PATCH 1/3] git p4 test: make sure P4CONFIG relative path works
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Mar 7, 2013, 23:19 UTC
- Message-ID
- <1362698357-7334-2-git-send-email-pw@padd.com>
- In-Reply-To
- <1362698357-7334-1-git-send-email-pw@padd.com>
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> --- t/t9808-git-p4-chdir.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh index dc92e60..55c5e36 100755 --- a/t/t9808-git-p4-chdir.sh +++ b/t/t9808-git-p4-chdir.sh @@ -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 '
-- 1.8.2.rc2.64.g8335025