summaryrefslogtreecommitdiff
path: root/t/lib-git-p4.sh
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2013-01-27 03:11:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-27 06:00:38 (GMT)
commit6492a1041a66f19589f6001400005a3913884882 (patch)
treefc80d37e17d45cc91ad86730102a5e600989b2d5 /t/lib-git-p4.sh
parent50038ba92a22743be8c105e16fb559a6d96c3a7a (diff)
downloadgit-6492a1041a66f19589f6001400005a3913884882.zip
git-6492a1041a66f19589f6001400005a3913884882.tar.gz
git-6492a1041a66f19589f6001400005a3913884882.tar.bz2
git p4 test: start p4d inside its db dir
This will avoid having to do native path conversion for windows. Also may be a bit cleaner always to know that p4d has that working directory, instead of wherever the function was called from. 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.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index c5d1f4d..185f6f1 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -40,8 +40,11 @@ start_p4d() {
mkdir -p "$db" "$cli" "$git" &&
rm -f "$pidfile" &&
(
- p4d -q -r "$db" -p $P4DPORT &
- echo $! >"$pidfile"
+ cd "$db" &&
+ {
+ p4d -q -p $P4DPORT &
+ echo $! >"$pidfile"
+ }
) &&
# This gives p4d a long time to start up, as it can be