From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 25 Jan 2018 00:16:15 +0000 (+0000)
Subject: test-charset: Divulge mhshow output if iconv_open(3) doesn't gripe.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/695ed941eb3d907a7c2912d9ea8fdad06a3fd0f5

test-charset: Divulge mhshow output if iconv_open(3) doesn't gripe.

Andy Bradford was finding the grep failed, but was left with no
explanation that's what happened, or what the file that didn't match
contained.
---

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index e87f0a51..79e8d527 100755
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -146,10 +146,13 @@ EOF
 run_prog mhshow $msgnum > $actual 2>&1
 if [ $iconv_elides_question_marks -eq 1 ]; then
     check "$expected" "$actual"
+elif grep "Can't convert .*us-ascii to UTF-8" "$actual" >/dev/null; then
+    :
 else
-    grep "Can't convert .*us-ascii to UTF-8" "$actual" >/dev/null  ||  failed=1
+    echo 'iconv complaint not found'
+    sed -n l "$actual"
+    failed=1
 fi
 
-
 finish_test
 exit $failed