From c3e1d49e345da9678d145bedea5faf0bdcdefd27 Mon Sep 17 00:00:00 2001
From: Andres Freund <andres@anarazel.de>
Date: Wed, 26 Oct 2016 06:51:16 -0700
Subject: [PATCH] Don't try to shutdown servers that have not been started in
 regression tests.

This avoids spurious output from failing shutdowns and uninitialized
variable warnings if pg_regress_multi.pl fails before starting servers.
---
 src/test/regress/pg_regress_multi.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/regress/pg_regress_multi.pl b/src/test/regress/pg_regress_multi.pl
index 170f32225..a38e810b6 100755
--- a/src/test/regress/pg_regress_multi.pl
+++ b/src/test/regress/pg_regress_multi.pl
@@ -47,6 +47,8 @@ my %fdwServers = ();
 my %functions = ();
 my %operators = ();
 
+my $serversAreShutdown = "TRUE";
+
 GetOptions(
     'bindir=s' => \$bindir,
     'libdir=s' => \$libdir,
@@ -170,7 +172,6 @@ for my $port (@workerPorts)
 }
 
 # Routine to shutdown servers at failure/exit
-my $serversAreShutdown = "FALSE";
 sub ShutdownServers()
 {
     if ($serversAreShutdown eq "FALSE")
@@ -204,6 +205,9 @@ END
     }
 }
 
+# Signal that servers should be shutdown
+$serversAreShutdown = "FALSE";
+
 # Start servers
 system("$bindir/pg_ctl",
        ('start', '-w',