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

[nmh] / test / mhshow / test-textcharset

diff --git a/test/mhshow/test-textcharset b/test/mhshow/test-textcharset
index 4e8cc37e4fee6ab0ad07f95ebc8694a71af89f6e..5fc07e6e927afc8698d18ef6467d5f272e059f38 100755 (executable)
--- a/test/mhshow/test-textcharset
+++ b/test/mhshow/test-textcharset
@@ -47,11 +47,11 @@ Subject: test display with charset conversion
 
 MIME-Version: 1.0
 
-part       text/plain                  10
+part       text/plain                  11
 4 ÷ 2 = 2
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 cat >>"$MH" <<'EOF'
@@ -81,10 +81,10 @@ Subject: test display with %{charset} expansion
 
 MIME-Version: 1.0
 
-windows-1252
+UTF-8
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -113,7 +113,7 @@ MIME-Version: 1.0
 
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -132,10 +132,10 @@ Subject: test display with %{charset} expansion
 
 MIME-Version: 1.0
 
--I windows-1252
+-I UTF-8
 EOF
 
-run_prog mhshow -nopause prev >"$actual" 2>&1
+run_prog mhshow prev >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -151,7 +151,7 @@ MIME-Version: 1.0
 
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -167,10 +167,10 @@ Subject: test display with %{charset} expansion
 
 MIME-Version: 1.0
 
--I windows-1252 file
+-I UTF-8 file
 EOF
 
-run_prog mhshow -nopause prev >"$actual" 2>&1
+run_prog mhshow prev >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -186,7 +186,7 @@ MIME-Version: 1.0
 file
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -218,7 +218,7 @@ MIME-Version: 1.0
 -I $QUOTEME' file
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -250,7 +250,7 @@ MIME-Version: 1.0
 file
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"
 
 
@@ -283,7 +283,7 @@ MIME-Version: 1.0
 
 EOF
 
-run_prog mhshow -nopause last >"$actual" 2>&1
+run_prog mhshow last >"$actual" 2>&1
 check "$expected" "$actual"