Convert whatnow over to using the new Attach header.

[nmh] / test / mhstore / test-mhstore

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index b332cd92cce3a1146bfbe7755ae67656abe4e732..2dc035718f894cb3c2fbf913c4f4493ff4a7e7df 100755 (executable)
--- 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