From 695ed941eb3d907a7c2912d9ea8fdad06a3fd0f5 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Thu, 25 Jan 2018 00:16:15 +0000 Subject: [PATCH] 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. --- test/mhshow/test-charset | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 -- 2.56.0