X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ftest-lib-common.sh;h=ebbf4cdfa6fd2e727f78d651fdf31dcb8c3ead7d;hp=6c3571d4c56001b65402ac4658662684b8613839;hb=a06b76b9b3c1212b17d2bb170bdd511711f578f8;hpb=7ac96b149f5a0e5c03b64856d7c20789dab3c628 diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 6c3571d4..ebbf4cdf 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -41,10 +41,6 @@ restore_database () { 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/ subdirectory and are run in 'trash directory' subdirectory. -TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test - # Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work # on systems where ../notmuch depends on LD_LIBRARY_PATH. LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} @@ -109,8 +105,7 @@ fi gen_msg_cnt=0 gen_msg_filename="" gen_msg_id="" -generate_message () -{ +generate_message () { # This is our (bash-specific) magic for doing named parameters local -A template="($@)" local additional_headers @@ -229,8 +224,7 @@ EOF # # All of the arguments and return values supported by generate_message # are also supported here, so see that function for details. -add_message () -{ +add_message () { generate_message "$@" && notmuch new > /dev/null }