Skip to content
Snippets Groups Projects
Commit bbcafabb authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

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 a6ea7277
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,9 @@ use warnings; ...@@ -3,6 +3,9 @@ use warnings;
use TestLib; use TestLib;
use Test::More tests => 8; use Test::More tests => 8;
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 => 4; use Test::More tests => 4;
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
......
File moved
...@@ -3,9 +3,14 @@ use warnings; ...@@ -3,9 +3,14 @@ use warnings;
use PostgresNode; use PostgresNode;
use TestLib; use TestLib;
use Test::More tests => 40; use Test::More tests => 40;
use ServerSetup;
use File::Copy; use File::Copy;
use FindBin;
use lib $FindBin::RealBin;
use SSLServer;
#### Some configuration #### Some configuration
# This is the hostname used to connect to the server. This cannot be a # This is the hostname used to connect to the server. This cannot be a
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# The server is configured to only accept connections from localhost. If you # 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 # want to run the client from another host, you'll have to configure that
# manually. # manually.
package ServerSetup; package SSLServer;
use strict; use strict;
use warnings; use warnings;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment