From 7fd6de8204c5a8eddf6112863bf3a3e89b666509 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Thu, 7 Mar 2013 19:07:02 -0600 Subject: [PATCH] t/test.sh: remove a few calls to force-delete that shouldn't be needed. Signed-off-by: Rob Browning --- t/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" -- 2.39.2