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

Commitd0a98e1

Browse files
committed
Always skip recovery SysV shared memory tests on Windows
These tests were disabled on git master in commit8e5ce1c. This doesthe same thing on the back branches.Discussion:https://postgr.es/m/a1c40fab-a38c-cb42-6879-125f834e837b@2ndQuadrant.com
1 parentdeba7c6 commitd0a98e1

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

‎src/test/recovery/t/017_shm.pl‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use TestLib;
1010
use Time::HiResqw(usleep);
1111

12-
if ($^Oeq'msys')
12+
if ($windows_os)
1313
{
14-
planskip_all=>'missing SIGKILL implementation';
14+
planskip_all=>'SysV shared memory not supported by this platform';
1515
}
1616
else
1717
{
@@ -129,7 +129,7 @@ sub init_start
129129
"SELECT pid FROM pg_stat_activity WHERE query = '$slow_query'");
130130
$gnat->kill9;
131131
unlink($gnat->data_dir .'/postmaster.pid');
132-
$gnat->rotate_logfile;# on Windows, can't open old log for writing
132+
$gnat->rotate_logfile;
133133
log_ipcs();
134134
# Reject ordinary startup. Retry for the same reasons poll_start() does.
135135
my$pre_existing_msg =qr/pre-existing shared memory block/;
@@ -158,13 +158,10 @@ sub init_start
158158
'single-user mode detected live backend via shared memory');
159159
log_ipcs();
160160
# Fail to reject startup if shm key N has become available and we crash while
161-
# using key N+1. This is unwanted, but expected. Windows is immune, because
162-
# its GetSharedMemName() use DataDir strings, not numeric keys.
161+
# using key N+1. This is unwanted, but expected.
163162
$flea->stop;# release first key
164-
is($gnat->start(fail_ok=> 1),
165-
$TestLib::windows_os ? 0 : 1,
166-
'key turnover fools only sysv_shmem.c');
167-
$gnat->stop;# release first key (no-op on $TestLib::windows_os)
163+
is($gnat->start(fail_ok=> 1), 1,'key turnover fools only sysv_shmem.c');
164+
$gnat->stop;# release first key
168165
$flea->start;# grab first key
169166
# cleanup
170167
TestLib::system_log('pg_ctl','kill','QUIT',$slow_pid);

0 commit comments

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