Skip to content

Commit 1c6d462

Browse files
adunstanadunstan
committed
Remove most msys special processing in TAP tests
Following migration of Windows buildfarm members running TAP tests to use of ucrt64 perl for those tests, special processing for msys perl is no longer necessary and so is removed. Backpatch to release 10 Discussion: https://postgr.es/m/c65a8781-77ac-ea95-d185-6db291e1baeb@dunslane.net
1 parent 95d9813 commit 1c6d462

File tree

6 files changed

+2
-41
lines changed

6 files changed

+2
-41
lines changed

‎src/bin/pg_ctl/t/001_start_stop.pl

+1-10
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,7 @@
4747
'pg_ctl', 'start', '-D', "$tempdir/data", '-l',
4848
"$PostgreSQL::Test::Utils::log_path/001_start_stop_server.log"
4949
];
50-
if ($Config{osname} ne 'msys')
51-
{
52-
command_like($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
53-
}
54-
else
55-
{
56-
57-
# use the version of command_like that doesn't hang on Msys here
58-
command_like_safe($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
59-
}
50+
command_like($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
6051

6152
# sleep here is because Windows builds can't check postmaster.pid exactly,
6253
# so they may mistake a pre-existing postmaster.pid for one created by the

‎src/bin/pg_rewind/t/RewindTest.pm

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ sub check_query
115115
}
116116
else
117117
{
118-
$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
119118
is($stdout, $expected_stdout, "$test_name: query result matches");
120119
}
121120
return;

‎src/test/perl/PostgreSQL/Test/Cluster.pm

+1-14
Original file line numberDiff line numberDiff line change
@@ -904,9 +904,7 @@ sub kill9
904904
local %ENV = $self->_get_env();
905905

906906
print "### Killing node \"$name\" using signal 9\n";
907-
# kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl.
908-
kill(9, $self->{_pid})
909-
or PostgreSQL::Test::Utils::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid});
907+
kill(9, $self->{_pid});
910908
$self->{_pid} = undef;
911909
return;
912910
}
@@ -1845,19 +1843,13 @@ sub psql
18451843
}
18461844
};
18471845

1848-
# Note: on Windows, IPC::Run seems to convert \r\n to \n in program output
1849-
# if we're using native Perl, but not if we're using MSys Perl. So do it
1850-
# by hand in the latter case, here and elsewhere.
1851-
18521846
if (defined $$stdout)
18531847
{
1854-
$$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
18551848
chomp $$stdout;
18561849
}
18571850

18581851
if (defined $$stderr)
18591852
{
1860-
$$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
18611853
chomp $$stderr;
18621854
}
18631855

@@ -2337,9 +2329,7 @@ sub poll_query_until
23372329
my $result = IPC::Run::run $cmd, '<', \$query,
23382330
'>', \$stdout, '2>', \$stderr;
23392331

2340-
$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
23412332
chomp($stdout);
2342-
$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
23432333
chomp($stderr);
23442334

23452335
if ($stdout eq $expected && $stderr eq '')
@@ -2849,9 +2839,6 @@ sub pg_recvlogical_upto
28492839
}
28502840
};
28512841

2852-
$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
2853-
$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
2854-
28552842
if (wantarray)
28562843
{
28572844
return ($ret, $stdout, $stderr, $timeout);

‎src/test/perl/PostgreSQL/Test/Utils.pm

-6
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ sub run_command
401401
my ($cmd) = @_;
402402
my ($stdout, $stderr);
403403
my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
404-
foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
405404
chomp($stdout);
406405
chomp($stderr);
407406
return ($stdout, $stderr);
@@ -486,7 +485,6 @@ sub slurp_file
486485
$contents = <$fh>;
487486
close $fh;
488487

489-
$contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
490488
return $contents;
491489
}
492490

@@ -844,7 +842,6 @@ sub command_like
844842
my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
845843
ok($result, "$test_name: exit code 0");
846844
is($stderr, '', "$test_name: no stderr");
847-
$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
848845
like($stdout, $expected_stdout, "$test_name: matches");
849846
return;
850847
}
@@ -897,7 +894,6 @@ sub command_fails_like
897894
print("# Running: " . join(" ", @{$cmd}) . "\n");
898895
my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
899896
ok(!$result, "$test_name: exit code not 0");
900-
$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
901897
like($stderr, $expected_stderr, "$test_name: matches");
902898
return;
903899
}
@@ -942,8 +938,6 @@ sub command_checks_all
942938
if $ret & 127;
943939
$ret = $ret >> 8;
944940

945-
foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
946-
947941
# check status
948942
ok($ret == $expected_ret,
949943
"$test_name status (got $ret vs expected $expected_ret)");

‎src/test/recovery/t/021_row_visibility.pl

-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ sub send_query_and_wait
182182
$$psql{run}->pump_nb();
183183
while (1)
184184
{
185-
# See PostgreSQL::Test::Cluster.pm's psql()
186-
$$psql{stdout} =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
187-
188185
last if $$psql{stdout} =~ /$untl/;
189186

190187
if ($psql_timeout->is_expired)

‎src/test/recovery/t/cp_history_files

-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ use warnings;
77
die "wrong number of arguments" if @ARGV != 2;
88
my ($source, $target) = @ARGV;
99
exit if $source !~ /history/;
10-
if ($^O eq 'msys')
11-
{
12-
# make a windows path look like an msys path if necessary
13-
$source =~ s!^([A-Za-z]):!'/' . lc($1)!e;
14-
$source =~ s!\\!/!g;
15-
}
16-
1710
copy($source, $target) or die "couldn't copy $source to $target: $!";

0 commit comments

Comments
 (0)