summaryrefslogtreecommitdiff
path: root/src/test/ssl/t/002_scram.pl
diff options
context:
space:
mode:
authorAndrew Dunstan2019-02-07 15:22:49 +0000
committerAndrew Dunstan2019-02-07 16:09:08 +0000
commit8ce641f99709669133c6cbb12aa3d516af7897aa (patch)
treef2a9227221de33c7ddfa0048a09baff6b05bbe4d /src/test/ssl/t/002_scram.pl
parent0c1f8f166cb6273ab9c06a5f3c2ebedbf36f93e9 (diff)
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/[email protected] Backpatch as appropriate to 9.5
Diffstat (limited to 'src/test/ssl/t/002_scram.pl')
-rw-r--r--src/test/ssl/t/002_scram.pl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
index d45b9c5db3a..e636efa54dc 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';