diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2019-09-09 08:42:06 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2019-09-09 08:46:06 -0400 |
| commit | d0a98e1ae26c46d6949e06136bfcbd7fb4cdb111 (patch) | |
| tree | 2259f68696a64636c658f649f3aad00b3222ed47 | |
| parent | deba7c6fc3ccbaadfccbf70f73480d33a27b15b4 (diff) | |
| download | postgresql-d0a98e1ae26c46d6949e06136bfcbd7fb4cdb111.tar.gz postgresql-d0a98e1ae26c46d6949e06136bfcbd7fb4cdb111.zip | |
Always skip recovery SysV shared memory tests on Windows
These tests were disabled on git master in commit 8e5ce1c3f8. This does
the same thing on the back branches.
Discussion: https://postgr.es/m/a1c40fab-a38c-cb42-6879-125f834e837b@2ndQuadrant.com
| -rw-r--r-- | src/test/recovery/t/017_shm.pl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/test/recovery/t/017_shm.pl b/src/test/recovery/t/017_shm.pl index 70b789f704d..13eb9353aa8 100644 --- a/src/test/recovery/t/017_shm.pl +++ b/src/test/recovery/t/017_shm.pl @@ -9,9 +9,9 @@ use Test::More; use TestLib; use Time::HiRes qw(usleep); -if ($^O eq 'msys') +if ($windows_os) { - plan skip_all => 'missing SIGKILL implementation'; + plan skip_all => 'SysV shared memory not supported by this platform'; } else { @@ -129,7 +129,7 @@ my $slow_pid = $gnat->safe_psql('postgres', "SELECT pid FROM pg_stat_activity WHERE query = '$slow_query'"); $gnat->kill9; unlink($gnat->data_dir . '/postmaster.pid'); -$gnat->rotate_logfile; # on Windows, can't open old log for writing +$gnat->rotate_logfile; log_ipcs(); # Reject ordinary startup. Retry for the same reasons poll_start() does. my $pre_existing_msg = qr/pre-existing shared memory block/; @@ -158,13 +158,10 @@ like($single_stderr, $pre_existing_msg, 'single-user mode detected live backend via shared memory'); log_ipcs(); # Fail to reject startup if shm key N has become available and we crash while -# using key N+1. This is unwanted, but expected. Windows is immune, because -# its GetSharedMemName() use DataDir strings, not numeric keys. +# using key N+1. This is unwanted, but expected. $flea->stop; # release first key -is( $gnat->start(fail_ok => 1), - $TestLib::windows_os ? 0 : 1, - 'key turnover fools only sysv_shmem.c'); -$gnat->stop; # release first key (no-op on $TestLib::windows_os) +is($gnat->start(fail_ok => 1), 1, 'key turnover fools only sysv_shmem.c'); +$gnat->stop; # release first key $flea->start; # grab first key # cleanup TestLib::system_log('pg_ctl', 'kill', 'QUIT', $slow_pid); |