Skip to content

Commit ef82387

Browse files
committed
Don't run recover crash_temp_files test in Windows perl
This reverts commit 677271a. "Unbreak recovery test on Windows" The test hangs on Windows, and attempts to remedy the problem have proved fragile at best. So we simply disable the test on Windows perl. (Msys perl seems perfectly happy). Discussion: https://postgr.es/m/5b748470-7335-5439-e876-6a88c951e1c5@dunslane.net
1 parent 2b526ed commit ef82387

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/test/recovery/t/022_crash_temp_files.pl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@
66
use Test::More;
77
use Config;
88

9-
plan tests => 9;
9+
if ($Config{osname} eq 'MSWin32')
10+
{
11+
plan skip_all => 'tests hang on Windows';
12+
exit;
13+
}
14+
else
15+
{
16+
plan tests => 9;
17+
}
1018

1119

1220
# To avoid hanging while expecting some specific input from a psql
@@ -124,10 +132,8 @@ BEGIN
124132
my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
125133
is($ret, 0, 'killed process with KILL');
126134

127-
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
128-
$killme_stdin .= "\\q\n";
135+
# Close psql session
129136
$killme->finish;
130-
$killme_stdin2 .= "\\q\n";
131137
$killme2->finish;
132138

133139
# Wait till server restarts
@@ -214,10 +220,8 @@ BEGIN
214220
$ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
215221
is($ret, 0, 'killed process with KILL');
216222

217-
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
218-
$killme_stdin .= "\\q\n";
223+
# Close psql session
219224
$killme->finish;
220-
$killme_stdin2 .= "\\q\n";
221225
$killme2->finish;
222226

223227
# Wait till server restarts

0 commit comments

Comments
 (0)