From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 8 Mar 2013 01:07:02 +0000 (-0600)
Subject: t/test.sh: remove a few calls to force-delete that shouldn't be needed.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7fd6de8204c5a8eddf6112863bf3a3e89b666509;p=packages%2Fb%2Fbup.git

t/test.sh: remove a few calls to force-delete that shouldn't be needed.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/t/test.sh b/t/test.sh
index 5bc6617..8c81452 100755
--- a/t/test.sh
+++ b/t/test.sh
@@ -24,7 +24,7 @@ force-delete()
 WVSTART "init"
 
 #set -x
-force-delete "$BUP_DIR"
+test -d "$BUP_DIR" && rm -r "$BUP_DIR"
 WVPASS bup init
 
 WVSTART "index"
@@ -664,12 +664,12 @@ WVSTART "save disjoint top-level directories"
     mkdir -p $D/x
     date > $D/x/1
     tmpdir="$(mktemp -d /tmp/bup-test-XXXXXXX)"
-    cleanup() { set -x; force-delete "${tmpdir}"; set +x; }
+    cleanup() { set -x; rm -r "${tmpdir}"; set +x; }
     trap cleanup EXIT
     date > "$tmpdir/2"
 
     export BUP_DIR="$TOP/buptest.tmp"
-    force-delete "$BUP_DIR"
+    test -d "$BUP_DIR" && rm -r "$BUP_DIR"
 
     WVPASS bup init
     WVPASS bup index -vu $(pwd)/$D/x "$tmpdir"