Change mhstore test slightly to test canonical line ending handling for

[nmh] / test / mhstore / test-mhstore

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index b92972b3e8dadab3b589e576a69c27bedfbe8084..2a4203943c4ad6cf6397845472da3961c2b6ddf6 100755 (executable)
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -46,18 +46,18 @@ run_test "mhstore -file $MH_TEST_DIR/Mail/inbox/5" \
 check $expected 5.txt 'keep first'
 
 # check -file -
 check $expected 5.txt 'keep first'
 
 # check -file -

-stored_contents=`mhstore -file - < $MH_TEST_DIR/Mail/inbox/5 2>&1 | \
+stored_contents=`run_prog mhstore -file - < $MH_TEST_DIR/Mail/inbox/5 2>&1 | \

   sed 's/.*as file //'`
 check $expected $stored_contents 'keep first'
 
 # check -outfile
   sed 's/.*as file //'`
 check $expected $stored_contents 'keep first'
 
 # check -outfile

-mhstore 5 -outfile "$actual" 2>&1 | grep -v '^storing' && \
-  echo unexpected output from test-mhstore check -outfile
+run_prog mhstore 5 -outfile "$actual" 2>&1 | grep -v '^storing' && \
+  echo unexpected output from test-mhstore check -outfile >&2

 check $expected "$actual" 'keep first'
 
 # check -outfile -
 check $expected "$actual" 'keep first'
 
 # check -outfile -

-echo 'storing message 5 to stdout' >> "$expected"
-mhstore 5 -outfile - >"$actual" 2>&1
+echo 'storing message 5 to stdout' >>"$expected"
+run_prog mhstore 5 -outfile - >"$actual" 2>&1

 check $expected "$actual"
 
 # check message number greater than highest
 check $expected "$actual"
 
 # check message number greater than highest


@@ -116,7 +116,8 @@ Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"
 Content-Transfer-Encoding: base64
 
 Content-Disposition: attachment; filename="test4.txt"
 Content-Transfer-Encoding: base64
 

-VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4K
+VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4NClRoaXMgdGVzdCBoYXMgbXVsdGlw
+bGUgbGluZXMuDQo=

 
 ------- =_aaaaaaaaaa0--
 EOF
 
 ------- =_aaaaaaaaaa0--
 EOF


@@ -153,12 +154,14 @@ EOF
 check $expected 11.3.txt
 cat > $expected <<EOF
 This is the fourth text/plain part.
 check $expected 11.3.txt
 cat > $expected <<EOF
 This is the fourth text/plain part.

+This test has multiple lines.

 EOF
 check $expected 11.4.txt
 
 # check -auto
 cat > $expected <<EOF
 This is the fourth text/plain part.
 EOF
 check $expected 11.4.txt
 
 # check -auto
 cat > $expected <<EOF
 This is the fourth text/plain part.

+This test has multiple lines.

 EOF
 run_test 'mhstore last -part 4 -auto' \
   'storing message 11 part 4 as file test4.txt'
 EOF
 run_test 'mhstore last -part 4 -auto' \
   'storing message 11 part 4 as file test4.txt'


@@ -307,6 +310,7 @@ mkdir "$dir"
 echo "nmh-storage: $storagedir" >> $MH
 cat > $expected <<EOF
 This is the fourth text/plain part.
 echo "nmh-storage: $storagedir" >> $MH
 cat > $expected <<EOF
 This is the fourth text/plain part.

+This test has multiple lines.

 EOF
 run_test 'mhstore 11 -part 4' \
 "storing message 11 part 4 as file $storagedir/11.4.txt"
 EOF
 run_test 'mhstore 11 -part 4' \
 "storing message 11 part 4 as file $storagedir/11.4.txt"