[PATCHv2 08/10] git p4 test: cleanup_git should make a new $git
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Jun 27, 2012, 12:01 UTC
- Message-ID
- <1340798463-14499-9-git-send-email-pw@padd.com>
- In-Reply-To
- <1340798463-14499-1-git-send-email-pw@padd.com>
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> --- t/lib-git-p4.sh | 3 ++- t/t9800-git-p4-basic.sh | 1 + t/t9806-git-p4-options.sh | 1 - 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 4c5b1f6..0bc3566 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -86,5 +86,6 @@ kill_p4d() { } cleanup_git() { - rm -rf "$git" + rm -rf "$git" && + mkdir "$git" } diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 60c1f57..234f727 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -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 && ( diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh index a37c6cb..fa40cc8 100755 --- a/t/t9806-git-p4-options.sh +++ b/t/t9806-git-p4-options.sh @@ -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 &&
-- 1.7.11.1.69.gd505fd2