X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT020-compact.sh;h=d77db00d22ff3c1abf3f9f6ab6fc863b4e591589;hp=a3d7380e81c8c12f1a685ca1f4e61cac292ea63c;hb=HEAD;hpb=c0c5645538d9dda84657602ee4189f4ff3ca1aeb

diff --git a/test/T020-compact.sh b/test/T020-compact.sh
index a3d7380e..d77db00d 100755
--- a/test/T020-compact.sh
+++ b/test/T020-compact.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 test_description='"notmuch compact"'
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 add_message '[subject]=One'
 add_message '[subject]=Two'
@@ -10,20 +10,8 @@ notmuch tag +tag1 \*
 notmuch tag +tag2 subject:Two
 notmuch tag -tag1 +tag3 subject:Three
 
-if [ $NOTMUCH_HAVE_XAPIAN_COMPACT -eq 0 ]; then
-    test_begin_subtest "Compact unsupported: error message"
-    output=$(notmuch compact --quiet 2>&1)
-    test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support.
-Compaction failed: Unsupported operation"
-
-    test_begin_subtest "Compact unsupported: status code"
-    test_expect_code 1 "notmuch compact"
-
-    test_done
-fi
-
 test_begin_subtest "Running compact"
-test_expect_success "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old"
+test_expect_success "notmuch compact --backup=${TMP_DIRECTORY}/xapian.old"
 
 test_begin_subtest "Compact preserves database"
 output=$(notmuch search \* | notmuch_search_sanitize)
@@ -34,7 +22,7 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
 
 test_begin_subtest "Restoring Backup"
 test_expect_success 'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&
-     mv ${TEST_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian'
+     mv ${TMP_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian'
 
 test_begin_subtest "Checking restored backup"
 output=$(notmuch search \* | notmuch_search_sanitize)