X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1ae96ed565c1bb0ae054f81b47bf960d2b62e658..2b60a54adb3b0bf5a9b927708085492b816a6015:/test/format/test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index 023d5794..7805d0bf 100755
--- 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,14 +47,15 @@ Usage: dp [switches] dates ...
   -help
 EOF
 
-$dp -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
 case `$dp -v` in
   dp\ --*) ;;
-  *           ) printf "$0: dp -v generated unexpected output\n" >&2
-                failed=`expr ${failed:-0} + 1`;;
+  *      ) printf '%s: dp -v generated unexpected output\n' "$0" >&2
+           failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check unknown switch
@@ -57,7 +69,7 @@ cat >"$expected" <<EOF
 Sun, 01 Jul 2012 00:00:00
 EOF
 
-$dp 'Sun Jul  1 2012' > "$actual" 2>&1
+run_prog $dp 'Sun Jul  1 2012' > "$actual" 2>&1
 check "$expected" "$actual"
 
 # check with two valid dates
@@ -66,7 +78,7 @@ Sun, 01 Jul 2012 00:00:00
 Mon, 02 Jul 2012 00:00:00
 EOF
 
-$dp 'Sun Jul  1 2012' 'Mon Jul  2 2012' > "$actual" 2>&1
+run_prog $dp 'Sun Jul  1 2012' 'Mon Jul  2 2012' > "$actual" 2>&1
 check "$expected" "$actual"
 
 # check with invalid date
@@ -77,7 +89,7 @@ EOF
 cat >"$expected_err" <<EOF
 EOF
 
-$dp 'not a date' > "$actual" 2> "$actual_err"
+run_prog $dp 'not a date' > "$actual" 2> "$actual_err"
 check "$expected" "$actual"
 check "$expected_err" "$actual_err"
 
@@ -91,7 +103,7 @@ cat >"$expected" <<EOF
 Sun
 EOF
 
-$dp -form "$form" 'Jul 1 2012' >$actual 2>&1
+run_prog $dp -form "$form" 'Jul 1 2012' >$actual 2>&1
 check $expected $actual
 rm -f "$form"
 
@@ -100,15 +112,15 @@ cat >"$expected" <<EOF
 Sun
 EOF
 
-$dp -format '%(day{text})' 'Jul 1 2012' >$actual 2>&1
+run_prog $dp -format '%(day{text})' 'Jul 1 2012' >$actual 2>&1
 check $expected $actual
 
 # check -width
 cat >"$expected" <<EOF
-Sun, 01 Jul 2012
+Sun, 01 Jul 2012 
 EOF
 
-$dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1
+run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1
 check "$expected" "$actual"