test: factor out part of test-lib.sh into test-lib-common.sh

[notmuch] / test / emacs

diff --git a/test/emacs b/test/emacs
index 77265b026430d5a30d23cca426ff72153d623c5e..74155f8c6fc1515d9cccf96e90b9a72fc87fbb4f 100755 (executable)
--- a/test/emacs
+++ b/test/emacs
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 test_description="emacs interface"
-. test-lib.sh
+. ./test-lib.sh
 
 EXPECTED=$TEST_DIRECTORY/emacs.expected-output
 
@@ -809,9 +809,10 @@ test_emacs "(let ((mm-text-html-renderer
              (notmuch-show \"id:${gen_msg_id}\"))
            (test-output)" > /dev/null
 # Different Emacs versions and renderers give very different results,
-# so just check that something reasonable showed up.
+# so just check that something reasonable showed up.  We first cat the
+# output so the test framework will print it if the test fails.
 test_expect_success "Rendering HTML mail with images" \
-    'grep -q smiley OUTPUT'
+    'cat OUTPUT && grep -q smiley OUTPUT'
 
 
 test_done