mh-mkstemp.man: Detail exit status as 255 rather than -1.

[nmh] / test / anno / test-anno

diff --git a/test/anno/test-anno b/test/anno/test-anno
index 34048d90d547bfced5d9aa6f2c71216d1716220e..a7755ed7895c0205be0e1828bd0a9d27de8e3433 100755 (executable)
--- a/test/anno/test-anno
+++ b/test/anno/test-anno
@@ -16,6 +16,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' anno - # gcov
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -39,7 +41,8 @@ Usage: anno [+folder] [msgs] [switches]
   -([no]p)reserve
 EOF
 
-run_prog anno -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog anno -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
@@ -122,7 +125,8 @@ check "$expected" "$actual"
 rm "${MH_TEST_DIR}/Mail/draft"
 
 # check -append
-awk 'NR==6{print "Nmh-test:"}1' <"${MH_TEST_DIR}/Mail/inbox/1" >"$expected"
+sed -e 's/\(Subject: Testing message 1\)/\1\
+Nmh-test:/' <"${MH_TEST_DIR}/Mail/inbox/1" >"$expected"
 run_prog anno 1 -component Nmh-test -append
 sed -e 's/^Nmh-test:.*/Nmh-test:/' "${MH_TEST_DIR}/Mail/inbox/1" >"$actual"
 check "$expected" "$actual"