Merge remote-tracking branch 'origin/fix-locking'

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index d0d8028bdca5ee0919723749f5d86c45730df00a..efcab90c9a3afd64fb5ce50f68983d0ba648c154 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -18,6 +18,8 @@ setup_test
 
 LC_ALL=en_US.UTF-8; export LC_ALL
 
+test "$ICONV_ENABLED" -eq 0  &&  text_size=10  || text_size=11
+
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
@@ -46,11 +48,11 @@ Subject: test
 
 MIME-Version: 1.0
 
-part       text/plain                  10
+part       text/plain                  $text_size
 This is a test
 EOF
 
-run_prog mhshow -nopause $msgnum > $actual 2>&1
+run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual"
 
 exit $failed