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

diff --git a/test/format/test-dp b/test/format/test-dp
index 023d5794..bf27d475 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"
@@ -26,6 +37,7 @@ actual_err="$MH_TEST_DIR/$$.actual_err"
 
 
 # check -help
+start_test "-help"
 cat >"$expected" <<EOF
 Usage: dp [switches] dates ...
   switches are:
@@ -36,40 +48,47 @@ Usage: dp [switches] dates ...
   -help
 EOF
 
-$dp -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$dp" -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-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
+start_test "unknown switch"
 run_test "$dp -nonexistent" 'dp: -nonexistent unknown'
 
 # check with no switches
+start_test "with no switches"
 run_test "$dp" 'dp: usage: dp [switches] dates ...'
 
 # check with one valid date
+start_test "with one valid date"
 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
+start_test "with two valid dates"
 cat >"$expected" <<EOF
 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
+start_test "with invalid date"
 cat >"$expected" <<EOF
 error: not a date
 EOF
@@ -77,11 +96,12 @@ 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"
 
 # check -form
+start_test "-form"
 form="${MH_TEST_DIR}/Mail/dp-form"
 cat >"$form" <<'EOF'
 %(day{text})
@@ -91,25 +111,28 @@ 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"
 
 # check -format
+start_test "-format"
 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
+start_test "-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"
 
 
+finish_test
 exit ${failed:-0}