X-Git-Url: https://git.cworth.org/git?p=obsolete%2Fnotmuch-old;a=blobdiff_plain;f=test%2Freply;h=b0d854a1fc000a3a3b85089eb7c4ea5d6ab538cf;hp=d4389cf54f9fc63c6536db4372e77f5d8a9874c4;hb=e41cd1c518d7c5af565d4bed284bbd8a66366da1;hpb=dc51bf0ad4ce84414e79d2f30752502f7c0d46c0

diff --git a/test/reply b/test/reply
index d4389cf5..b0d854a1 100755
--- a/test/reply
+++ b/test/reply
@@ -201,12 +201,14 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \
 	    '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
 	    '[body]="Encoding"'
 
-output=$(notmuch reply id:${gen_msg_id})
-# Note that GMime changes from Q- to B-encoding
+# GMime happens to change from Q- to B-encoding.  We canonicalize the
+# case of the encoding and charset because different versions of GMime
+# capitalize the encoding differently.
+output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge')
 test_expect_equal "$output" "\
 From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: =?iso-8859-1?b?4N/n?=
-To: =?UTF-8?b?4piD?= <snowman@example.com>
+To: =?utf-8?b?4piD?= <snowman@example.com>
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>