diff options
| -rw-r--r-- | src/bin/pg_rewind/t/001_basic.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/002_databases.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/003_extrafiles.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/004_pg_xlog_symlink.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/005_same_timeline.pl | 3 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/RewindTest.pm (renamed from src/bin/pg_rewind/RewindTest.pm) | 0 | ||||
| -rw-r--r-- | src/test/ssl/t/001_ssltests.pl | 6 | ||||
| -rw-r--r-- | src/test/ssl/t/SSLServer.pm (renamed from src/test/ssl/ServerSetup.pm) | 2 |
8 files changed, 21 insertions, 2 deletions
diff --git a/src/bin/pg_rewind/t/001_basic.pl b/src/bin/pg_rewind/t/001_basic.pl index 1764b17c907..0008717c300 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 => 8; +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 20bdb4ab59d..8e63e5b6b96 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 => 4; +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 cedde1409bc..2badab54fc3 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 bdcab5688b9..1dfff3c8d23 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 0e334ee191a..40dbc44caa3 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 index 135d8f0449f..135d8f0449f 100644 --- a/src/bin/pg_rewind/RewindTest.pm +++ b/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 598a5fe07ac..a9568b2bf64 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -3,7 +3,7 @@ use warnings; use PostgresNode; use TestLib; use Test::More tests => 40; -use ServerSetup; + use File::Copy; # Like TestLib.pm, we use IPC::Run @@ -19,6 +19,10 @@ BEGIN } } +use FindBin; +use lib $FindBin::RealBin; + +use SSLServer; #### Some configuration # This is the hostname used to connect to the server. This cannot be a diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/t/SSLServer.pm index 08b686215b3..f4a7730e94e 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; |