Rearranged statements to avoid compile warning about mixed

[nmh] / test / mhl / test-mhl-flags

diff --git a/test/mhl/test-mhl-flags b/test/mhl/test-mhl-flags
index 36a73236556b7e944a335891847beac9aac3e1f2..2f10b86835fe3c22817e9e173e16913598d70324 100755 (executable)
--- a/test/mhl/test-mhl-flags
+++ b/test/mhl/test-mhl-flags
@@ -12,7 +12,7 @@ fi
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test

-mhl="${MH_LIB_DIR}/mhl"
+mhl="${MH_LIBEXEC_DIR}/mhl"

 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 


@@ -20,7 +20,7 @@ cat >`mhpath new` <<EOF
 MIME-Version: 1.0
 From: sender@example.com
 To: recipient@example.com
 MIME-Version: 1.0
 From: sender@example.com
 To: recipient@example.com

-Subject: message with blank lines
+Subject: message with blank lines and trailing spaces

 Date: Mon, 29 Apr 2013 11:51:45 -0400
 
 There are two blank lines below.  And there is a trailing space: 
 Date: Mon, 29 Apr 2013 11:51:45 -0400
 
 There are two blank lines below.  And there is a trailing space: 


@@ -30,7 +30,8 @@ And another trailing space:
 EOF
 
 
 EOF
 
 

-# check that blank lines don't end with whitepace
+# check nortrim (default), and that trailing whitespace in a
+# component is trimmed when filtering blank lines

 cat >"$expected" <<EOF
 > There are two blank lines below.  And there is a trailing space: 
 > And another trailing space: 
 cat >"$expected" <<EOF
 > There are two blank lines below.  And there is a trailing space: 
 > And another trailing space: 


@@ -39,7 +40,23 @@ cat >"$expected" <<EOF
 EOF
 
 cat >"$MH_TEST_DIR/test.format" <<EOF
 EOF
 
 cat >"$MH_TEST_DIR/test.format" <<EOF

-body:component="> ",overflowtext=,overflowoffset=0
+body:component="> "
+EOF
+
+"$mhl" -nomoreproc -form "$MH_TEST_DIR/test.format" `mhpath last` >"$actual"
+check "$expected" "$actual"
+
+
+# check rtrim
+cat >"$expected" <<EOF
+> There are two blank lines below.  And there is a trailing space:
+> And another trailing space:
+>
+>
+EOF
+
+cat >"$MH_TEST_DIR/test.format" <<EOF
+body:component="> ",rtrim

 EOF
 
 "$mhl" -nomoreproc -form "$MH_TEST_DIR/test.format" `mhpath last` >"$actual"
 EOF
 
 "$mhl" -nomoreproc -form "$MH_TEST_DIR/test.format" `mhpath last` >"$actual"


@@ -47,4 +64,5 @@ check "$expected" "$actual"
 
 
 rm -f "$MH_TEST_DIR/test.format"
 
 
 rm -f "$MH_TEST_DIR/test.format"

+

 exit $failed
 exit $failed