[PATCH] test: T020-compact.sh: fix work directory location

classic Classic list List threaded Threaded
2 messages Options
Tomi Ollila-2 Tomi Ollila-2
Reply | Threaded
Open this post in threaded view
|

[PATCH] test: T020-compact.sh: fix work directory location

Fix use of $TEST_DIRECTORY ($NOTMUCH_BUILDDIR/test/) with use of
$TMP_DIRECTORY ($NOTMUCH_BUILDDIR/test/tmp.T020-compact/ in case
of T020-compact.sh) as root directory where to write test files
and directories.
---
 test/T020-compact.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/T020-compact.sh b/test/T020-compact.sh
index 02f8738f..d77db00d 100755
--- a/test/T020-compact.sh
+++ b/test/T020-compact.sh
@@ -11,7 +11,7 @@ notmuch tag +tag2 subject:Two
 notmuch tag -tag1 +tag3 subject:Three
 
 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)
@@ -22,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)
--
2.29.2

_______________________________________________
notmuch mailing list -- [hidden email]
To unsubscribe send an email to [hidden email]
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] test: T020-compact.sh: fix work directory location

Tomi Ollila <[hidden email]> writes:

> Fix use of $TEST_DIRECTORY ($NOTMUCH_BUILDDIR/test/) with use of
> $TMP_DIRECTORY ($NOTMUCH_BUILDDIR/test/tmp.T020-compact/ in case
> of T020-compact.sh) as root directory where to write test files
> and directories.

Thanks for catching this. I had previously noticed the odd location, but
not got as far as fixing it.

applied to master.
_______________________________________________
notmuch mailing list -- [hidden email]
To unsubscribe send an email to [hidden email]