X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Femacs-large-search-buffer;h=9dcbef5e652d054531c75fe3d2a88bfb00d03d97;hb=bbdbc838547667c880ee38d017f751ebe5da49ab;hp=a3b5c79c8c5f799da1d003e7367a441c0d983550;hpb=708c4f46caae76d4366a6a8de369943a3adef443;p=notmuch

diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer
index a3b5c79c..9dcbef5e 100755
--- a/test/emacs-large-search-buffer
+++ b/test/emacs-large-search-buffer
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 test_description="Emacs with large search results buffer"
-. test-lib.sh
+. ./test-lib.sh
 
 x=xxxxxxxxxx # 10
 x=$x$x$x$x$x$x$x$x$x$x # 100
@@ -19,15 +19,25 @@ done
 notmuch new > /dev/null
 
 test_begin_subtest "Ensure that emacs doesn't drop results"
-expected="$(notmuch search '*' | sed -e 's/^thread:[0-9a-f]*  //' -e 's/;//' -e  's/xx*/[BLOB]/')
-End of search results."
-output=$(test_emacs '(notmuch-search "*") (notmuch-test-wait) (message (buffer-string))' 2>&1 | sed -e s',  *, ,g' -e 's/xxx*/[BLOB]/g')
-test_expect_equal "$output" "$expected"
+notmuch search '*' > EXPECTED
+sed -i -e 's/^thread:[0-9a-f]*  //' -e 's/;//' -e 's/xx*/[BLOB]/' EXPECTED
+echo 'End of search results.' >> EXPECTED
+
+test_emacs '(notmuch-search "*")
+	    (notmuch-test-wait)
+	    (test-output)'
+sed -i -e s',  *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT
+test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "Ensure that emacs doesn't drop error messages"
-output=$(test_emacs '(notmuch-search "--this-option-does-not-exist") (notmuch-test-wait) (message (buffer-string))' 2>&1)
-test_expect_equal "$output" "Error: Unexpected output from notmuch search:
+test_emacs '(notmuch-search "--this-option-does-not-exist")
+	    (notmuch-test-wait)
+	    (test-output)'
+cat <<EOF >EXPECTED
+Error: Unexpected output from notmuch search:
 Unrecognized option: --this-option-does-not-exist
-End of search results. (process returned 1)"
+End of search results.
+EOF
+test_expect_equal_file OUTPUT EXPECTED
 
 test_done