From: Austin Clements <amdragon@MIT.EDU>
Date: Tue, 20 Nov 2012 15:58:45 +0000 (-0500)
Subject: test: Produce useful output when the HTML with images test fails
X-Git-Tag: 0.15_rc1~165
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73a9fcf89bd7411d7d69f133a8c8dee313d93a58;p=notmuch.git

test: Produce useful output when the HTML with images test fails

Previously, this would simply indicate that the grep failed without
any indication of the Emacs output it failed on.  Now we take
advantage of the test framework's handling of stdout to display the
incorrect Emacs output if the test fails.
---

diff --git a/test/emacs b/test/emacs
index 77265b02..5649d55f 100755
--- a/test/emacs
+++ b/test/emacs
@@ -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