X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b7cbd7c8a39920669db61d331b12839f2a2d3562..6db4565184f61a8fa55e32296fdad530ebf00d6b:/test/format/test-fmtdump?ds=sidebyside

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 0c966c84..82791f48 100755
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -16,11 +16,32 @@ fi
 
 setup_test
 
-fmtdump - >/dev/null 2>&1 || true  # gcov
-
 # Use proper program, likely not the first one on PATH.
 fmtdump="${MH_LIBEXEC_DIR}/fmtdump"
 
+check_exit '-eq 1' "$fmtdump" -
+check_exit '-eq 1' "$fmtdump" -form
+check_exit '-eq 1' "$fmtdump" -format
+check_exit '-eq 1' "$fmtdump" foo bar
+check_exit '-eq 0' "$fmtdump" -format '
+    %4{} %(eq) %(getenv) %(decodecomp{}) %(trim{}) %(putaddr)
+    %(putlit) %(zputlit) %(compval{}) %(num)
+    %(plus) %(minus) %(multiply) %(divide) %(modulo)
+    %(charleft) %(kilo) %(kibi)
+    %(month{}) %(tzone{}) %(day{}) %(weekday{}) %(tws{}) %(pretty{})
+    %(sec{}) %(min{}) %(hour{}) %(year{}) %(yday{}) %(wday{})
+    %(clock{}) %(rclock{}) %(sday{}) %(dst{}) %(szone{})
+    %(date2local{}) %(date2gmt{})
+'
+check_exit '-eq 0' "$fmtdump" -format '
+    %(addr{}) %(pers{}) %(mbox{}) %(host{}) %(path{}) %(gname{})
+    %(note{}) %(proper{}) %(type{}) %(ingrp{}) %(nohost{})
+    %(formataddr) %(concataddr) %(getmymbox{}) %(getmyaddr{})
+    %<(null)%> %<(gt)%> %<(match)%> %<(amatch)%>
+    %(null) %(nonnull) %(ne) %(gt) %(match) %(amatch)
+'
+check_exit '-eq 0' "$fmtdump" -format "`printf '\302\010\014\015\011\177'`"
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -89,16 +110,16 @@ L7:	MYMBOX, c_name "from", c_type <ADDR>
 	LIT "To:"
 	PARSEADDR, c_name "to", c_type <ADDR>
 	LS_FRIENDLY, c_name "to", c_type <ADDR>
-	FT_LS_DECODE
+	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
+	LS_DECODE
 	STRF, width 17, fill ' '
 L9:	LIT "  "
 	LS_COMP, comp "subject"
-	FT_LS_DECODE
+	LS_DECODE
 	STR
 	LS_COMP, comp "body"
 	IF_S continue else goto L10
@@ -150,18 +171,18 @@ L7:	MYMBOX, c_name "from", c_type <ADDR>
 	LIT "To:"
 	PARSEADDR, c_name "to", c_type <ADDR>
 	LS_FRIENDLY, c_name "to", c_type <ADDR>
-	FT_LS_DECODE
-	
+	LS_DECODE
+	LS_UNQUOTE
 	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
-	
+	LS_DECODE
+	LS_UNQUOTE
 	STRF, width 17, fill ' '
 L9:	LIT "  "
 	LS_COMP, comp "subject"
-	FT_LS_DECODE
+	LS_DECODE
 	STR
 	LS_COMP, comp "body"
 	IF_S continue else goto L10