X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1ae96ed565c1bb0ae054f81b47bf960d2b62e658..a69b69121b49e6de84d0e8bf0e39ba3a96b67188:/test/format/test-fmtdump

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 44380bad..f919b0a3 100755
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -17,7 +17,9 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-fmtdump="${MH_LIB_DIR}/fmtdump"
+fmtdump="${MH_LIBEXEC_DIR}/fmtdump"
+
+check_exit '-eq 1' "$fmtdump" - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
@@ -35,13 +37,14 @@ Usage: fmtdump [switches]
   -help
 EOF
 
-$fmtdump -help >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+"$fmtdump" -help | sed '/^$/,$d' >"$actual" 2>&1
+check "$expected" "$actual"
 
 # check -version
 case `$fmtdump -v` in
   fmtdump\ --*) ;;
-  *           ) printf "$0: fmtdump -v generated unexpected output\n" >&2
+  *           ) printf '%s: fmtdump -v generated unexpected output\n' "$0" >&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
 
@@ -106,11 +109,70 @@ L10:	CHAR '\n'
 	DONE
 EOF
 
-$fmtdump >$actual 2>&1
-check $expected $actual 'keep first'
+run_prog $fmtdump >$actual 2>&1
+check $expected $actual
 
 # check -form
-$fmtdump -form "$MH_TEST_DIR/Mail/scan.default" >$actual 2>&1
+cat >$expected <<EOF
+	LV_DAT, value dat[0]
+	NUMF, width 4, fill ' '
+	LV_DAT, value dat[1]
+	IF_V_NE 0 continue else goto L0
+	CHAR '+'
+	GOTO L1
+L0:	CHAR ' '
+L1:	LS_COMP, comp "replied"
+	IF_S continue else goto L2
+	CHAR '-'
+	GOTO L3
+L2:	LS_COMP, comp "encrypted"
+	IF_S continue else goto L4
+	CHAR 'E'
+L3:	GOTO L5
+L4:	CHAR ' '
+L5:	PARSEDATE, c_name "date", c_type <DATE>
+	LV_MON, c_name "date", c_type <DATE>
+	NUMF, width 2, fill '0'
+	CHAR '/'
+	PARSEDATE, c_name "date", c_type <DATE>
+	LV_MDAY, c_name "date", c_type <DATE>
+	NUMF, width 2, fill '0'
+	LS_COMP, comp "date", c_type <DATE>
+	IF_S continue else goto L6
+	CHAR ' '
+	GOTO L7
+L6:	CHAR '*'
+L7:	MYMBOX, c_name "from", c_type <ADDR>
+	LV_COMPFLAG, comp "from", c_type <ADDR>
+	IF_V_NE 0 continue else goto L8
+	LS_COMP, comp "to", c_type <ADDR>
+	IF_S continue else goto L8
+	LIT "To:"
+	PARSEADDR, c_name "to", c_type <ADDR>
+	LS_FRIENDLY, c_name "to", c_type <ADDR>
+	FT_LS_DECODE
+	
+	STRF, width 14, fill ' '
+L8:	IF_V_EQ 0 continue else goto L9
+	PARSEADDR, c_name "from", c_type <ADDR>
+	LS_FRIENDLY, c_name "from", c_type <ADDR>
+	FT_LS_DECODE
+	
+	STRF, width 17, fill ' '
+L9:	LIT "  "
+	LS_COMP, comp "subject"
+	FT_LS_DECODE
+	STR
+	LS_COMP, comp "body"
+	IF_S continue else goto L10
+	LIT "<<"
+	COMP, comp "body"
+	LIT ">>"
+L10:	CHAR '\n'
+	DONE
+EOF
+
+run_prog $fmtdump -form "$MH_INST_DIR${nmhetcdir}/scan.default" >$actual 2>&1
 check $expected $actual
 
 # check -format
@@ -122,7 +184,7 @@ cat >$expected <<EOF
 L0:	DONE
 EOF
 
-$fmtdump -format '%<(lit 1234567890)%(strlen)%>' >$actual 2>&1
+run_prog $fmtdump -format '%<(lit 1234567890)%(strlen)%>' >$actual 2>&1
 check $expected $actual