X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4ea717b986c4b0ce9ccd01687c7b50bd2ab227ca..4c7e4c2d01cc991359289762aaf07f319d1e5879:/test/mhstore/test-mhstore

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index b332cd92..2a420394 100755
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -46,19 +46,18 @@ run_test "mhstore -file $MH_TEST_DIR/Mail/inbox/5" \
 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
-set +e
-mhstore 5 -outfile "$actual" 2>&1 | grep -v '^storing'
-set -e
+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 -
-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
@@ -117,7 +116,8 @@ Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt"
 Content-Disposition: attachment; filename="test4.txt"
 Content-Transfer-Encoding: base64
 
-VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4K
+VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4NClRoaXMgdGVzdCBoYXMgbXVsdGlw
+bGUgbGluZXMuDQo=
 
 ------- =_aaaaaaaaaa0--
 EOF
@@ -154,12 +154,14 @@ EOF
 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.
+This test has multiple lines.
 EOF
 run_test 'mhstore last -part 4 -auto' \
   'storing message 11 part 4 as file test4.txt'
@@ -308,6 +310,7 @@ mkdir "$dir"
 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"