further fix needed to restore PGINITDB testing

Nicholas Clark <[email protected]> Mon, 19 May 2014 12:26:00 +0100
Newsgroups gmane.comp.db.postgresql.dbdpg
Message-ID <[email protected]>
Patch attached is needed in addition to e25f0369332c3ace to restore
PGINITDB testing.

Nicholas Clark
0001-Further-fix-needed-to-get-PGINITDB-to-work-in-the-te.patch (text/x-diff, 881 B)
From 798614ad892249ffb7b670c1985b3d596eb58ba9 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <[email protected]>
Date: Fri, 16 May 2014 09:58:16 +0200
Subject: [PATCH] Further fix needed to get PGINITDB to work in the tests.

---
 t/dbdpg_test_setup.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/dbdpg_test_setup.pl b/t/dbdpg_test_setup.pl
index 899a313..6bae63c 100644
--- a/t/dbdpg_test_setup.pl
+++ b/t/dbdpg_test_setup.pl
@@ -722,6 +722,8 @@ sub get_test_settings {
 	my $pg_ctl = 'pg_ctl';
 	if (exists $ENV{DBDPG_INITDB} and -e $ENV{DBDPG_INITDB}) {
 		($pg_ctl = $ENV{DBDPG_INITDB}) =~ s/initdb/pg_ctl/;
+	} elsif (exists $ENV{PGINITDB} and -e $ENV{PGINITDB}) {
+		($pg_ctl = $ENV{PGINITDB}) =~ s/initdb/pg_ctl/;
 	}
 	my ($testdsn, $testuser, $testdir, $error) = ('','','','?');
 	my ($helpconnect, $su, $uid, $initdb, $version) = (0,'','','default',0);
-- 
1.9.1