Commit2bc0474

committed

MSYS: Skip src/test/recovery/t/017_shm.pl.

Commit947a350 relied on a featureavailable in v11 and later, so back-patching it to v10 and v9.6 wasinvalid. In those branches, revert it and skip the test on msys.Discussion:https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se

1 parent61c0962 commit2bc0474Copy full SHA for 2bc0474

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -734,9 +734,7 @@ sub kill9`
`734`	`734`	`my$name =$self->name;`
`735`	`735`	`returnunlessdefined$self->{_pid};`
`736`	`736`	`print"### Killing node\"$name\" using signal 9\n";`
`737`		`-# kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl.`
`738`		`-kill(9,$self->{_pid})`
`739`		`-or TestLib::system_or_bail('pg_ctl','kill','KILL',$self->{_pid});`
	`737`	`+kill(9,$self->{_pid})or BAIL_OUT("kill(9,$self->{_pid}) failed");`
`740`	`738`	`$self->{_pid} =undef;`
`741`	`739`	`return;`
`742`	`740`	`}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,14 @@`
`9`	`9`	`use TestLib;`
`10`	`10`	`use Time::HiResqw(usleep);`
`11`	`11`
`12`		`-plantests=> 5;`
	`12`	`+if ($^Oeq'msys')`
	`13`	`+{`
	`14`	`+planskip_all=>'missing SIGKILL implementation';`
	`15`	`+}`
	`16`	`+else`
	`17`	`+{`
	`18`	`+plantests=> 5;`
	`19`	`+}`
`13`	`20`
`14`	`21`	`my$tempdir = TestLib::tempdir;`
`15`	`22`	`my$port;`

Comments

(0)