Generalized gdbm 1.13 Memcheck:Param suppression a bit.

[nmh] / test / format / test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index fb3cc917825f7c449dac739749995cb1941c51dc..09d47f8cac647bacbced33a68564d340270fdc3d 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -17,7 +17,18 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-dp="${MH_LIB_DIR}/dp"
+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"
@@ -36,7 +47,8 @@ Usage: dp [switches] dates ...
   -help
 EOF
 
-run_prog $dp -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$dp" -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
@@ -105,7 +117,7 @@ check $expected $actual
 
 # check -width
 cat >"$expected" <<EOF
-Sun, 01 Jul 2012
+Sun, 01 Jul 2012 
 EOF
 
 run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1