Removed the -[no]textcharset switches that were added to mhshow(1)

[nmh] / test / mhshow / test-textcharset

diff --git a/test/mhshow/test-textcharset b/test/mhshow/test-textcharset
index b80802f1d4647771641044b4f482d7c0349c95c0..c55f95b938678ce8590a4eacae2efc0c344fa9e9 100755 (executable)
--- a/test/mhshow/test-textcharset
+++ b/test/mhshow/test-textcharset
@@ -17,10 +17,11 @@ fi
 setup_test
 
 if test "$ICONV_ENABLED" -eq 0; then
-  echo "$0: skipping test-textcharset because nmh was built without iconv"
-  exit 0
+  test_skip 'test-textcharset requires that nmh have been built with iconv'
 fi
 
+LC_ALL=en_US.UTF-8; export LC_ALL
+
 expected="$MH_TEST_DIR"/$$.expected
 actual="$MH_TEST_DIR"/$$.actual
 
@@ -37,21 +38,6 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100
 4 =F7 2 =3D 2
 EOF
 
-# Check -notextcharset.
-cat >"$expected" <<EOF
-Date:    Sun, 18 Dec 2005 00:52:39 +0100
-To:      bar@example.edu
-From:    foo@example.edu
-Subject: test display with charset conversion
-
-MIME-Version: 1.0
-
-EOF
-
-run_prog mhshow -textcharset UTF-8 -notextcharset -nopause last >"$actual" 2>&1
-check "$expected" "$actual"
-
-# Check -textcharset.
 cat >"$expected" <<EOF
 Date:    Sun, 18 Dec 2005 00:52:39 +0100
 To:      bar@example.edu
@@ -64,11 +50,6 @@ part       text/plain                  10
 4 ÷ 2 = 2
 EOF
 
-run_prog mhshow -textcharset UTF-8 -nopause last >"$actual" 2>&1
-check "$expected" "$actual" 'keep first'
-
-# Check use of user's locale.
-LC_ALL=en_US.UTF-8; export LC_ALL
 run_prog mhshow -nopause last >"$actual" 2>&1
 check "$expected" "$actual"