Minor testing tweaks.

diff --git a/t/02_timesync.t b/t/02_timesync.t
index 7e7515e00dd3f7e0263d1673eae3b5de42fbb7da..9cd9887bd5e44d78af798efe690e8751f9d5f257 100644 (file)
--- a/t/02_timesync.t
+++ b/t/02_timesync.t
@@ -1,5 +1,10 @@
+#!perl
+
+## Test the "version" action
+
+use strict;
+use warnings;
 use Data::Dumper;
-use DBI;
 use Test::More tests => 20;
 use lib 't','.';
 use CP_Testing;

diff --git a/t/CP_Testing.pm b/t/CP_Testing.pm
index c76df0f0882eaa74774689837e0956c3ed7ed038..f0280871ea7278ae9e9b451e2b4be5826b0b803c 100644 (file)
--- a/t/CP_Testing.pm
+++ b/t/CP_Testing.pm
@@ -67,7 +67,10 @@ sub test_database_handle {
 
                mkdir $dbdir;
 
-               my $initdb = $ENV{PGINITDB} || 'initdb';
+               my $initdb
+                       = $ENV{PGINITDB} ? $ENV{PGINITDB}
+                       : $ENV{PGBINDIR} ? "$ENV{PGBINDIR}/initdb"
+                       :                  'initdb';
 
                $com = qq{LC_ALL=en LANG=C $initdb --locale=C -E UTF8 -D $dbdir/data 2>&1};
                eval {
@@ -119,7 +122,10 @@ sub test_database_handle {
 
                unlink $logfile;
 
-               my $pg_ctl = $ENV{PG_CTL} || 'pg_ctl';
+               my $pg_ctl
+                       = $ENV{PG_CTL}   ? $ENV{PG_CTL}
+                       : $ENV{PGBINDIR} ? "$ENV{PGBINDIR}/pg_ctl"
+                       :                  'pg_ctl';
 
                $com = qq{LC_ALL=en LANG=C $pg_ctl -o '-k socket' -l $logfile -D "$dbdir/data" start};
                eval {