Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8ce641f

Browse files
committed
Fix searchpath and module location for pg_rewind and ssl TAP tests
The modules RewindTest.pm and ServerSetup.pm are really only useful forTAP tests, so they really belong in the TAP test directories. Inaddition, ServerSetup.pm is renamed to SSLServer.pm.The test scripts have their own directories added to the search path sothat the relocated modules will be found, regardless of where the testsare run from, even on modern perl where "." is no longer in thesearchpath.Discussion:https://postgr.es/m/e4b0f366-269c-73c3-9c90-d9cb0f4db1f9@2ndQuadrant.comBackpatch as appropriate to 9.5
1 parent0c1f8f1 commit8ce641f

File tree

9 files changed

+28
-3
lines changed

9 files changed

+28
-3
lines changed

‎src/bin/pg_rewind/t/001_basic.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
use TestLib;
44
use Test::Moretests=> 10;
55

6+
use FindBin;
7+
use lib$FindBin::RealBin;
8+
69
use RewindTest;
710

811
subrun_test

‎src/bin/pg_rewind/t/002_databases.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
use TestLib;
44
use Test::Moretests=> 6;
55

6+
use FindBin;
7+
use lib$FindBin::RealBin;
8+
69
use RewindTest;
710

811
subrun_test

‎src/bin/pg_rewind/t/003_extrafiles.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use File::Find;
99

10+
use FindBin;
11+
use lib$FindBin::RealBin;
12+
1013
use RewindTest;
1114

1215

‎src/bin/pg_rewind/t/004_pg_xlog_symlink.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
plantests=> 4;
1818
}
1919

20+
use FindBin;
21+
use lib$FindBin::RealBin;
22+
2023
use RewindTest;
2124

2225
subrun_test

‎src/bin/pg_rewind/t/005_same_timeline.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
use TestLib;
44
use Test::Moretests=> 1;
55

6+
use FindBin;
7+
use lib$FindBin::RealBin;
8+
69
use RewindTest;
710

811
# Test that running pg_rewind if the two clusters are on the same
File renamed without changes.

‎src/test/ssl/t/001_ssltests.pl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
use PostgresNode;
44
use TestLib;
55
use Test::More;
6-
use ServerSetup;
6+
77
use File::Copy;
88

9+
use FindBin;
10+
use lib$FindBin::RealBin;
11+
12+
use SSLServer;
13+
914
if ($ENV{with_openssl}eq'yes')
1015
{
1116
plantests=> 71;

‎src/test/ssl/t/002_scram.pl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
use PostgresNode;
66
use TestLib;
77
use Test::More;
8-
use ServerSetup;
8+
99
use File::Copy;
1010

11+
use FindBin;
12+
use lib$FindBin::RealBin;
13+
14+
use SSLServer;
15+
1116
if ($ENV{with_openssl}ne'yes')
1217
{
1318
planskip_all=>'SSL not supported by this build';

‎src/test/ssl/ServerSetup.pmrenamed to‎src/test/ssl/t/SSLServer.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# explicitly because an invalid sslcert or sslrootcert, respectively,
2525
# causes those to be ignored.)
2626

27-
packageServerSetup;
27+
packageSSLServer;
2828

2929
use strict;
3030
use warnings;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp