X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0f0af4e32a4d734209c16282b63f7cb1094e2699..e9ecb46532df39b4429a086ae72c3bfa29c122ef:/test/format/test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index b1a19956..19e28c33 100755
--- 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.
-dp="${MH_LIB_DIR}/dp"
+dp="${MH_LIBEXEC_DIR}/dp"
 
 expected="$MH_TEST_DIR/$$.expected"
 expected_err="$MH_TEST_DIR/$$.expected_err"
@@ -36,7 +36,8 @@ 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
@@ -57,7 +58,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 +67,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 +78,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 +92,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 +101,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"