X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=d9bb2541bdc907c877162628befc51de1ccc091b;hb=a9849caadf862545aa5563a782dc84d67bc7e1b0;hp=5f7fa14172efc7a01d5c337540f9e771f84811f9;hpb=5497b01c27ed217bc351d9995e0f46c3d6ff2442;p=notmuch diff --git a/test/test-lib.sh b/test/test-lib.sh index 5f7fa141..d9bb2541 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -377,7 +377,7 @@ add_email_corpus () cp -a ../corpus.mail ${MAIL_DIR} else cp -a ../corpus ${MAIL_DIR} - notmuch new + notmuch new >/dev/null cp -a ${MAIL_DIR} ../corpus.mail fi } @@ -414,6 +414,24 @@ test_expect_equal () fi } +test_expect_equal_failure () +{ + test "$#" = 3 && { prereq=$1; shift; } || prereq= + test "$#" = 2 || + error "bug in the test script: not 2 or 3 parameters to test_expect_equal" + + output="$1" + expected="$2" + if ! test_skip "$@" + then + if [ "$output" = "$expected" ]; then + test_known_broken_ok_ "$test_subtest_name" + else + test_known_broken_failure_ "$test_subtest_name" + fi + fi +} + NOTMUCH_NEW () { notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file' @@ -715,6 +733,16 @@ test_done () { fi } +test_emacs () { + emacs_code="$1" + emacs --batch --no-site-file --directory ../../emacs --load notmuch.el \ + --eval "(defun notmuch-test-wait () + (while (get-buffer-process (current-buffer)) + (sleep-for 0.1)))" \ + --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) ${emacs_code})" +} + + find_notmuch_path () { dir="$1"