X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT060-count.sh;h=a1ebf8ba527ea30948c3abd79427a6fa5e83277b;hb=f2e2f2aa96cb0d40c6fb85cde2ab82380c367485;hp=d27e1babd0a600a60a29203b44a6d5d8ea74d39b;hpb=5a69aa14748162429c43ad5ff3d8b35779fff0d4;p=notmuch diff --git a/test/T060-count.sh b/test/T060-count.sh index d27e1bab..a1ebf8ba 100755 --- a/test/T060-count.sh +++ b/test/T060-count.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash test_description='"notmuch count" for messages and threads' -. ./test-lib.sh || exit 1 +. $(dirname "$0")/test-lib.sh || exit 1 add_email_corpus @@ -95,7 +95,8 @@ test_expect_equal_file EXPECTED OUTPUT backup_database test_begin_subtest "error message for database open" -dd if=/dev/zero of="${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending}" count=3 +target=(${MAIL_DIR}/.notmuch/xapian/postlist.*) +dd if=/dev/zero of="$target" count=3 notmuch count '*' 2>OUTPUT 1>/dev/null output=$(sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' OUTPUT) test_expect_equal "${output}" "A Xapian exception occurred opening database" @@ -107,7 +108,7 @@ set logging file count-files-gdb.log set logging on break count_files commands -shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending} +shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.* continue end run @@ -127,7 +128,6 @@ test_expect_equal_file EXPECTED OUTPUT.clean restore_database test_begin_subtest "count library function is non-destructive" -test_subtest_known_broken cat< EXPECTED 1: 52 messages 2: 52 messages