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

Commit65dfe9d

Browse files
committed
Move libpq encryption negotiation tests
The test targets libpq's options, so 'src/test/interfaces/libpq/t' isa more natural place for it.While doing this, I noticed that I had missed adding thelibpq_encryption subdir to the Makefile. That's why this commit onlyneeds to remove it from the meson.build file.Per Peter Eisentraut's suggestion.Discussion:https://www.postgresql.org/message-id/09d4bf5d-d0fa-4c66-a1d7-5ec757609646@eisentraut.org
1 parent084cae5 commit65dfe9d

File tree

7 files changed

+8
-78
lines changed

7 files changed

+8
-78
lines changed

‎src/interfaces/libpq/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ subdir = src/interfaces/libpq
1313
top_builddir = ../../..
1414
include$(top_builddir)/src/Makefile.global
1515

16-
exportwith_ssl
16+
exportwith_sslwith_gssapiwith_krb_srvnam
1717

1818
PGFILEDESC = "PostgreSQL Access Library"
1919

‎src/interfaces/libpq/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,13 @@ tests += {
118118
't/002_api.pl',
119119
't/003_load_balance_host_list.pl',
120120
't/004_load_balance_dns.pl',
121+
't/005_negotiate_encryption.pl',
121122
],
122-
'env': {'with_ssl': ssl_library},
123+
'env': {
124+
'with_ssl': ssl_library,
125+
'with_gssapi': gssapi.found() ?'yes' :'no',
126+
'with_krb_srvnam':'postgres',
127+
},
123128
},
124129
}
125130

‎src/test/libpq_encryption/t/001_negotiate_encryption.plrenamed to‎src/interfaces/libpq/t/005_negotiate_encryption.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
if ($ssl_supported != 0)
131131
{
132-
my$certdir = dirname(__FILE__) ."/../../ssl/ssl";
132+
my$certdir = dirname(__FILE__) ."/../../../test/ssl/ssl";
133133

134134
copy"$certdir/server-cn-only.crt","$pgdata/server.crt"
135135
||die"copying server.crt:$!";

‎src/test/libpq_encryption/Makefile

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/test/libpq_encryption/README

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/test/libpq_encryption/meson.build

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/test/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ subdir('regress')
44
subdir('isolation')
55

66
subdir('authentication')
7-
subdir('libpq_encryption')
87
subdir('recovery')
98
subdir('subscription')
109
subdir('modules')

0 commit comments

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