Added oauth support to whatnow.

[nmh] / test / format / test-dp

diff --git a/test/format/test-dp b/test/format/test-dp
index b1a199561a94f3afb1c27064f75f0766e376529c..b190d73316932517f7ddf30b0e41fe44be9847ef 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,7 @@ Usage: dp [switches] dates ...
   -help
 EOF
 
   -help
 EOF
 

-$dp -help >"$actual" 2>&1
+run_prog $dp -help >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version


@@ -57,7 +57,7 @@ cat >"$expected" <<EOF
 Sun, 01 Jul 2012 00:00:00
 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
 check "$expected" "$actual"
 
 # check with two valid dates


@@ -66,7 +66,7 @@ Sun, 01 Jul 2012 00:00:00
 Mon, 02 Jul 2012 00:00:00
 EOF
 
 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
 check "$expected" "$actual"
 
 # check with invalid date


@@ -77,7 +77,7 @@ EOF
 cat >"$expected_err" <<EOF
 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 "$expected" "$actual"
 check "$expected_err" "$actual_err"
 


@@ -91,7 +91,7 @@ cat >"$expected" <<EOF
 Sun
 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 $expected $actual
 rm -f "$form"
 


@@ -100,15 +100,15 @@ cat >"$expected" <<EOF
 Sun
 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
 check $expected $actual
 
 # check -width
 cat >"$expected" <<EOF

-Sun, 01 Jul 2012
+Sun, 01 Jul 2012 

 EOF
 
 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"
 
 
 check "$expected" "$actual"