From 3ec1a6e6b1da94abc1ae9050bade6cb1e39c5d7e Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 19:48:09 -0700 Subject: [PATCH] [test] Make the cleanup generic--only need special case cleanups for monotone --- test/run-tests | 4 +++- test/vcs/bzr.sh | 3 +-- test/vcs/cvs.sh | 5 +---- test/vcs/darcs.sh | 3 +-- test/vcs/git.sh | 3 +-- test/vcs/hg.sh | 3 +-- test/vcs/mtn.sh | 4 ---- test/vcs/svn.sh | 5 +---- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/test/run-tests b/test/run-tests index f388b17..4d89b91 100755 --- a/test/run-tests +++ b/test/run-tests @@ -48,7 +48,9 @@ run_test () { exit 1; fi -# ${VC}_cleanup "$WD" "$REPO" + ${VC}_cleanup "$WD" "$REPO" + rm -rf "$WD" + rm -rf "$REPO" } for vc in $VCs; do diff --git a/test/vcs/bzr.sh b/test/vcs/bzr.sh index a176083..34e0ba0 100644 --- a/test/vcs/bzr.sh +++ b/test/vcs/bzr.sh @@ -9,6 +9,5 @@ bzr_init () { } bzr_cleanup () { - WD=$1 - rm -rf "$WD" + true } diff --git a/test/vcs/cvs.sh b/test/vcs/cvs.sh index 8f5985c..1faa009 100644 --- a/test/vcs/cvs.sh +++ b/test/vcs/cvs.sh @@ -13,8 +13,5 @@ cvs_init () { } cvs_cleanup () { - WD=$1 - REPO=$2 - rm -rf "$WD" - rm -rf "$REPO" + true } diff --git a/test/vcs/darcs.sh b/test/vcs/darcs.sh index 4d2b79c..d4f8498 100644 --- a/test/vcs/darcs.sh +++ b/test/vcs/darcs.sh @@ -9,6 +9,5 @@ darcs_init () { } darcs_cleanup () { - WD=$1 - rm -rf "$WD" + true } diff --git a/test/vcs/git.sh b/test/vcs/git.sh index 64fdda6..0ed09f1 100644 --- a/test/vcs/git.sh +++ b/test/vcs/git.sh @@ -9,6 +9,5 @@ git_init () { } git_cleanup () { - WD=$1 - rm -rf "$WD" + true } diff --git a/test/vcs/hg.sh b/test/vcs/hg.sh index df23b4a..017087f 100644 --- a/test/vcs/hg.sh +++ b/test/vcs/hg.sh @@ -9,6 +9,5 @@ hg_init () { } hg_cleanup () { - WD=$1 - rm -rf "$WD" + true } diff --git a/test/vcs/mtn.sh b/test/vcs/mtn.sh index 857a3cc..f5be166 100644 --- a/test/vcs/mtn.sh +++ b/test/vcs/mtn.sh @@ -17,9 +17,5 @@ mtn_init () { } mtn_cleanup () { - WD=$1 - REPO=$2 - rm -rf "$REPO" - rm -rf "$WD" rm -rf "$MTN_KEYDIR" } diff --git a/test/vcs/svn.sh b/test/vcs/svn.sh index e748e25..b768843 100644 --- a/test/vcs/svn.sh +++ b/test/vcs/svn.sh @@ -13,8 +13,5 @@ svn_init () { } svn_cleanup () { - WD=$1 - REPO=$2 - rm -rf "$WD" - rm -rf "$REPO" + true } -- 2.51.2