Permalink
Browse files

git p4 test: cleanup_git should make a new $git

For convenience, leave one in place at the end of each
test so that it is not necessary to build a new one.  This
makes it consistent with $cli.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent f69b3a9 commit 23a2666c2e402b2425a6abe910c04cebbea25e31 Pete Wyckoff committed with gitster Jun 27, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 t/lib-git-p4.sh
  2. +1 −0 t/t9800-git-p4-basic.sh
  3. +0 −1 t/t9806-git-p4-options.sh
View
@@ -99,5 +99,6 @@ kill_p4d() {
}
cleanup_git() {
- rm -rf "$git"
+ rm -rf "$git" &&
+ mkdir "$git"
}
View
@@ -270,6 +270,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
'
test_expect_success 'clone bare' '
+ rm -rf "$git" &&
git p4 clone --dest="$git" --bare //depot &&
test_when_finished cleanup_git &&
(
@@ -149,7 +149,6 @@ test_expect_success 'clone --use-client-spec' '
cleanup_git &&
# same thing again, this time with variable instead of option
- mkdir "$git" &&
(
cd "$git" &&
git init &&

0 comments on commit 23a2666

Please sign in to comment.