mirror of
https://github.com/postgres/postgres.git
synced 2025-07-07 00:36:50 +03:00
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
This commit is contained in:
@ -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 => 71;
|
||||
|
@ -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';
|
||||
|
@ -24,7 +24,7 @@
|
||||
# explicitly because an invalid sslcert or sslrootcert, respectively,
|
||||
# causes those to be ignored.)
|
||||
|
||||
package ServerSetup;
|
||||
package SSLServer;
|
||||
|
||||
use strict;
|
||||
use warnings;
|
Reference in New Issue
Block a user