lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / test / format / test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index b190d73316932517f7ddf30b0e41fe44be9847ef..7805d0bf9c039414fbfa57bde83f49b7c64b5c5a 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -19,6 +19,17 @@ setup_test
 # Use proper program, likely not the first one on PATH.
 dp="${MH_LIBEXEC_DIR}/dp"
 
 # Use proper program, likely not the first one on PATH.
 dp="${MH_LIBEXEC_DIR}/dp"
 

+check_exit '-eq 1' $dp -
+check_exit '-eq 1' $dp -format foo -form
+check_exit '-eq 1' $dp -form foo -format
+check_exit '-eq 1' $dp -width
+x=tendixzehn
+l=$x$x$x$x$x
+c=$l$l
+check_exit '-eq 1' $dp `echo $c | sed 's/./ &/g'` 101
+COLUMNS=1 check_exit '-eq 0' $dp foo
+check_exit '-eq 0' $dp -width 0 foo
+

 expected="$MH_TEST_DIR/$$.expected"
 expected_err="$MH_TEST_DIR/$$.expected_err"
 actual="$MH_TEST_DIR/$$.actual"
 expected="$MH_TEST_DIR/$$.expected"
 expected_err="$MH_TEST_DIR/$$.expected_err"
 actual="$MH_TEST_DIR/$$.actual"


@@ -36,7 +47,8 @@ Usage: dp [switches] dates ...
   -help
 EOF
 
   -help
 EOF
 

-run_prog $dp -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version