Commit 8ce641f9 authored by Andrew Dunstan's avatar Andrew Dunstan

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
parent 0c1f8f16
...@@ -3,6 +3,9 @@ use warnings; ...@@ -3,6 +3,9 @@ use warnings;
use TestLib; use TestLib;
use Test::More tests => 10; use Test::More tests => 10;
use FindBin;
use lib $FindBin::RealBin;
use RewindTest; use RewindTest;
sub run_test sub run_test
......
...@@ -3,6 +3,9 @@ use warnings; ...@@ -3,6 +3,9 @@ use warnings;
use TestLib; use TestLib;
use Test::More tests => 6; use Test::More tests => 6;
use FindBin;
use lib $FindBin::RealBin;
use RewindTest; use RewindTest;
sub run_test sub run_test
......
...@@ -7,6 +7,9 @@ use Test::More tests => 4; ...@@ -7,6 +7,9 @@ use Test::More tests => 4;
use File::Find; use File::Find;
use FindBin;
use lib $FindBin::RealBin;
use RewindTest; use RewindTest;
......
...@@ -17,6 +17,9 @@ else ...@@ -17,6 +17,9 @@ else
plan tests => 4; plan tests => 4;
} }
use FindBin;
use lib $FindBin::RealBin;
use RewindTest; use RewindTest;
sub run_test sub run_test
......
...@@ -3,6 +3,9 @@ use warnings; ...@@ -3,6 +3,9 @@ use warnings;
use TestLib; use TestLib;
use Test::More tests => 1; use Test::More tests => 1;
use FindBin;
use lib $FindBin::RealBin;
use RewindTest; use RewindTest;
# Test that running pg_rewind if the two clusters are on the same # Test that running pg_rewind if the two clusters are on the same
......
...@@ -3,9 +3,14 @@ use warnings; ...@@ -3,9 +3,14 @@ use warnings;
use PostgresNode; use PostgresNode;
use TestLib; use TestLib;
use Test::More; use Test::More;
use ServerSetup;
use File::Copy; use File::Copy;
use FindBin;
use lib $FindBin::RealBin;
use SSLServer;
if ($ENV{with_openssl} eq 'yes') if ($ENV{with_openssl} eq 'yes')
{ {
plan tests => 71; plan tests => 71;
......
...@@ -5,9 +5,14 @@ use warnings; ...@@ -5,9 +5,14 @@ use warnings;
use PostgresNode; use PostgresNode;
use TestLib; use TestLib;
use Test::More; use Test::More;
use ServerSetup;
use File::Copy; use File::Copy;
use FindBin;
use lib $FindBin::RealBin;
use SSLServer;
if ($ENV{with_openssl} ne 'yes') if ($ENV{with_openssl} ne 'yes')
{ {
plan skip_all => 'SSL not supported by this build'; plan skip_all => 'SSL not supported by this build';
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# explicitly because an invalid sslcert or sslrootcert, respectively, # explicitly because an invalid sslcert or sslrootcert, respectively,
# causes those to be ignored.) # causes those to be ignored.)
package ServerSetup; package SSLServer;
use strict; use strict;
use warnings; use warnings;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment