debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: fix test database backup/restore location

Browse source 
backup_database() and restore_database() used to store the backups in
the test specific temporary directory, through the current working
directory being there. Commit 8e7fb88237 ("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 <dkg@fifthhorseman.net>.
This commit is contained in:
Jani Nikula 2017-10-24 21:36:11 +03:00 committed by David Bremner
parent 9479baf6f1
commit 1b91884296
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-lib-common.sh
View file

@ -31,14 +31,14 @@ fi
backup_database () { backup_database () {
test_name=$(basename $0 .sh) test_name=$(basename $0 .sh)
rm -rf $NOTMUCH_BUILDDIR/test/notmuch-dir-backup."$test_name" rm -rf $TMP_DIRECTORY/notmuch-dir-backup."$test_name"
cp -pR ${MAIL_DIR}/.notmuch $NOTMUCH_BUILDDIR/test/notmuch-dir-backup."${test_name}" cp -pR ${MAIL_DIR}/.notmuch $TMP_DIRECTORY/notmuch-dir-backup."${test_name}"
} }
restore_database () { restore_database () {
test_name=$(basename $0 .sh) test_name=$(basename $0 .sh)
rm -rf ${MAIL_DIR}/.notmuch 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 # Test the binaries we have just built. The tests are kept in