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

Commit7d49803

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 parent3fb307b commit7d49803

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
use TestLib;
1111
use Time::HiResqw(usleep);
1212

13-
plantests=> 5;
13+
if ($windows_os)
14+
{
15+
planskip_all=>'SysV shared memory not supported by this platform';
16+
}
17+
else
18+
{
19+
plantests=> 5;
20+
}
1421

1522
my$tempdir = TestLib::tempdir;
1623
my$port;
@@ -124,7 +131,7 @@ sub init_start
124131
"SELECT pid FROM pg_stat_activity WHERE query = '$slow_query'");
125132
$gnat->kill9;
126133
unlink($gnat->data_dir .'/postmaster.pid');
127-
$gnat->rotate_logfile;# on Windows, can't open old log for writing
134+
$gnat->rotate_logfile;
128135
log_ipcs();
129136
# Reject ordinary startup. Retry for the same reasons poll_start() does.
130137
my$pre_existing_msg =qr/pre-existing shared memory block/;
@@ -153,13 +160,10 @@ sub init_start
153160
'single-user mode detected live backend via shared memory');
154161
log_ipcs();
155162
# Fail to reject startup if shm key N has become available and we crash while
156-
# using key N+1. This is unwanted, but expected. Windows is immune, because
157-
# its GetSharedMemName() use DataDir strings, not numeric keys.
163+
# using key N+1. This is unwanted, but expected.
158164
$flea->stop;# release first key
159-
is($gnat->start(fail_ok=> 1),
160-
$TestLib::windows_os ? 0 : 1,
161-
'key turnover fools only sysv_shmem.c');
162-
$gnat->stop;# release first key (no-op on $TestLib::windows_os)
165+
is($gnat->start(fail_ok=> 1), 1,'key turnover fools only sysv_shmem.c');
166+
$gnat->stop;# release first key
163167
$flea->start;# grab first key
164168
# cleanup
165169
TestLib::system_log('pg_ctl','kill','QUIT',$slow_pid);

0 commit comments

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