From 8722d2cbc0500b8ae1ebaf0a388115617615c1eb Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Thu, 7 Feb 2019 10:22:49 -0500
Subject: [PATCH] Fix searchpath and module location for pg_rewind and ssl TAP
 tests

The modules RewindTest.pm and ServerSetup.pm are really only useful for
TAP tests, so they really belong in the TAP test directories. In
addition, ServerSetup.pm is renamed to SSLServer.pm.

The test scripts have their own directories added to the search path so
that the relocated modules will be found, regardless of where the tests
are run from, even on modern perl where "." is no longer in the
searchpath.

Discussion: https://postgr.es/m/e4b0f366-269c-73c3-9c90-d9cb0f4db1f9@2ndQuadrant.com

Backpatch as appropriate to 9.5
---
 src/bin/pg_rewind/t/001_basic.pl                | 3 +++
 src/bin/pg_rewind/t/002_databases.pl            | 3 +++
 src/bin/pg_rewind/t/003_extrafiles.pl           | 3 +++
 src/bin/pg_rewind/t/004_pg_xlog_symlink.pl      | 3 +++
 src/bin/pg_rewind/t/005_same_timeline.pl        | 3 +++
 src/bin/pg_rewind/{ => t}/RewindTest.pm         | 0
 src/test/ssl/t/001_ssltests.pl                  | 7 ++++++-
 src/test/ssl/t/002_scram.pl                     | 7 ++++++-
 src/test/ssl/{ServerSetup.pm => t/SSLServer.pm} | 2 +-
 9 files changed, 28 insertions(+), 3 deletions(-)
 rename src/bin/pg_rewind/{ => t}/RewindTest.pm (100%)
 rename src/test/ssl/{ServerSetup.pm => t/SSLServer.pm} (99%)

diff --git a/src/bin/pg_rewind/t/001_basic.pl b/src/bin/pg_rewind/t/001_basic.pl
index 53dbf45be2..115192170e 100644
--- a/src/bin/pg_rewind/t/001_basic.pl
+++ b/src/bin/pg_rewind/t/001_basic.pl
@@ -3,6 +3,9 @@ use warnings;
 use TestLib;
 use Test::More tests => 10;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
 use RewindTest;
 
 sub run_test
diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl
index 2c9e427831..6dc05720a1 100644
--- a/src/bin/pg_rewind/t/002_databases.pl
+++ b/src/bin/pg_rewind/t/002_databases.pl
@@ -3,6 +3,9 @@ use warnings;
 use TestLib;
 use Test::More tests => 6;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
 use RewindTest;
 
 sub run_test
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl
index 496f38c457..c4040bd562 100644
--- a/src/bin/pg_rewind/t/003_extrafiles.pl
+++ b/src/bin/pg_rewind/t/003_extrafiles.pl
@@ -7,6 +7,9 @@ use Test::More tests => 4;
 
 use File::Find;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
 use RewindTest;
 
 
diff --git a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
index 280eceb992..ed1ddb6b60 100644
--- a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
+++ b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
@@ -17,6 +17,9 @@ else
 	plan tests => 4;
 }
 
+use FindBin;
+use lib $FindBin::RealBin;
+
 use RewindTest;
 
 sub run_test
diff --git a/src/bin/pg_rewind/t/005_same_timeline.pl b/src/bin/pg_rewind/t/005_same_timeline.pl
index 0e334ee191..40dbc44caa 100644
--- a/src/bin/pg_rewind/t/005_same_timeline.pl
+++ b/src/bin/pg_rewind/t/005_same_timeline.pl
@@ -3,6 +3,9 @@ use warnings;
 use TestLib;
 use Test::More tests => 1;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
 use RewindTest;
 
 # Test that running pg_rewind if the two clusters are on the same
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm
similarity index 100%
rename from src/bin/pg_rewind/RewindTest.pm
rename to src/bin/pg_rewind/t/RewindTest.pm
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index e550207454..39ede38c99 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -3,9 +3,14 @@ use warnings;
 use PostgresNode;
 use TestLib;
 use Test::More;
-use ServerSetup;
+
 use File::Copy;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
+use SSLServer;
+
 if ($ENV{with_openssl} eq 'yes')
 {
 	plan tests => 64;
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
index b460a7fa8a..3ebb3db4b6 100644
--- a/src/test/ssl/t/002_scram.pl
+++ b/src/test/ssl/t/002_scram.pl
@@ -5,9 +5,14 @@ use warnings;
 use PostgresNode;
 use TestLib;
 use Test::More;
-use ServerSetup;
+
 use File::Copy;
 
+use FindBin;
+use lib $FindBin::RealBin;
+
+use SSLServer;
+
 if ($ENV{with_openssl} ne 'yes')
 {
 	plan skip_all => 'SSL not supported by this build';
diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/t/SSLServer.pm
similarity index 99%
rename from src/test/ssl/ServerSetup.pm
rename to src/test/ssl/t/SSLServer.pm
index 5ffc0b5385..b58277bd8c 100644
--- a/src/test/ssl/ServerSetup.pm
+++ b/src/test/ssl/t/SSLServer.pm
@@ -14,7 +14,7 @@
 # The server is configured to only accept connections from localhost. If you
 # want to run the client from another host, you'll have to configure that
 # manually.
-package ServerSetup;
+package SSLServer;
 
 use strict;
 use warnings;