From 1b91884296f7e423f2e190ccf7f590ccb3028fdd Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 24 Oct 2017 21:36:11 +0300 Subject: [PATCH] test: fix test database backup/restore location backup_database() and restore_database() used to store the backups in the test specific temporary directory, through the current working directory being there. Commit 8e7fb88237ae ("test: use source and build paths in test-lib-common.sh") started using a test specific backup directories under the build tree test directory. This was in error. Switch back to the old location, but using paths to the location instead of relying on current working directory. Reported by Daniel Kahn Gillmor . --- test/test-lib-common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 4300eb65..6c3571d4 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -31,14 +31,14 @@ fi backup_database () { test_name=$(basename $0 .sh) - rm -rf $NOTMUCH_BUILDDIR/test/notmuch-dir-backup."$test_name" - cp -pR ${MAIL_DIR}/.notmuch $NOTMUCH_BUILDDIR/test/notmuch-dir-backup."${test_name}" + rm -rf $TMP_DIRECTORY/notmuch-dir-backup."$test_name" + cp -pR ${MAIL_DIR}/.notmuch $TMP_DIRECTORY/notmuch-dir-backup."${test_name}" } restore_database () { test_name=$(basename $0 .sh) rm -rf ${MAIL_DIR}/.notmuch - cp -pR $NOTMUCH_BUILDDIR/test/notmuch-dir-backup."${test_name}" ${MAIL_DIR}/.notmuch + cp -pR $TMP_DIRECTORY/notmuch-dir-backup."${test_name}" ${MAIL_DIR}/.notmuch } # Test the binaries we have just built. The tests are kept in