Added start_test/finish_test.

[nmh] / test / format / test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index fb3cc917825f7c449dac739749995cb1941c51dc..19e28c330a89c358a634ff296333868463a85f95 100755 (executable)
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -17,7 +17,7 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
 setup_test
 
 # Use proper program, likely not the first one on PATH.

-dp="${MH_LIB_DIR}/dp"
+dp="${MH_LIBEXEC_DIR}/dp"

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


@@ -36,7 +36,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


@@ -105,7 +106,7 @@ check $expected $actual
 
 # check -width
 cat >"$expected" <<EOF
 
 # 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
 EOF
 
 run_prog $dp -width 17 'Sun Jul  1 2012' > "$actual" 2>&1