X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib-common.sh;h=4300eb65418f1afa8d4cd93c3fd1d1a001b47ccf;hb=886c0b1666478548485682fbcaa667bb3cc0f138;hp=5e53348a943886c99926aa24b748a62b14aa9ba3;hpb=8dfa116010adba3a41b6a4248d1706b34ffae600;p=notmuch diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 5e53348a..4300eb65 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -307,13 +307,9 @@ export PATH MANPATH # Test repository test="tmp.$(basename "$0" .sh)" -test -n "$root" && test="$root/$test" -case "$test" in -/*) TMP_DIRECTORY="$test" ;; - *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;; -esac +TMP_DIRECTORY="$TEST_DIRECTORY/$test" test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY -rm -fr "$test" || { +rm -rf "$TMP_DIRECTORY" || { GIT_EXIT_OK=t echo >&6 "FATAL: Cannot prepare test area" exit 1