From:	turnstep@cvs.perl.org	Date:	Fri Aug 22 15:24:27 2008
Subject:	[svn:DBD-Pg] r11670 - DBD-Pg/trunk/t

Author: turnstep
Date: Fri Aug 22 14:24:26 2008
New Revision: 11670

Modified:
   DBD-Pg/trunk/t/dbdpg_test_setup.pl

Log:
7.4 pg_ctl won't even let root run --help


Modified: DBD-Pg/trunk/t/dbdpg_test_setup.pl
==============================================================================
--- DBD-Pg/trunk/t/dbdpg_test_setup.pl	(original)
+++ DBD-Pg/trunk/t/dbdpg_test_setup.pl	Fri Aug 22 14:24:26 2008
@@ -268,10 +268,10 @@
 		}
 		$info = '';
 		eval {
-			$info = qx{$pg_ctl --help};
+			$info = qx{$pg_ctl --help 2>&1};
 		};
 		last GETHANDLE if $@; ## Fail - pg_ctl bad
-		if (!defined $info or $info !~ /\@postgresql\.org/) {
+		if (!defined $info or ($info !~ /\@postgresql\.org/ and $info !~ /run as root/)) {
 			$@ = defined $initdb ? "Bad pg_ctl output: $info" : 'Bad pg_ctl output';
 			last GETHANDLE; ## Fail - pg_ctl bad
 		}