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

diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl
index 4bfc23b93deb9cfe624940e6eb0f89fcd9a646e1..d656a7fe1832242021788ed92e55eec3845764b2 100644 (file)
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -46,16 +46,7 @@ my $ctlcmd = [
    'pg_ctl', 'start', '-D', "$tempdir/data", '-l',
    "$TestLib::log_path/001_start_stop_server.log"
 ];
-if ($Config{osname} ne 'msys')
-{
-   command_like($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
-}
-else
-{
-
-   # use the version of command_like that doesn't hang on Msys here
-   command_like_safe($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
-}
+command_like($ctlcmd, qr/done.*server started/s, 'pg_ctl start');
 
 # sleep here is because Windows builds can't check postmaster.pid exactly,
 # so they may mistake a pre-existing postmaster.pid for one created by the

diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm
index 938c661afc29f8d4877b2d196483e7d59f4de28b..356c9ba0539f3d1d771a0b890f67689dcab499e6 100644 (file)
--- a/src/bin/pg_rewind/t/RewindTest.pm
+++ b/src/bin/pg_rewind/t/RewindTest.pm
@@ -115,7 +115,6 @@ sub check_query
    }
    else
    {
-       $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        is($stdout, $expected_stdout, "$test_name: query result matches");
    }
    return;

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 40ba59f3864b41105a81e41959328efe96bb4c7a..50acc169024d35716110631a31b0f62419b8f31c 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -846,9 +846,7 @@ sub kill9
    local %ENV = $self->_get_env();
 
    print "### Killing node \"$name\" using signal 9\n";
-   # kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl.
-   kill(9, $self->{_pid})
-     or TestLib::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid});
+   kill(9, $self->{_pid});
    $self->{_pid} = undef;
    return;
 }
@@ -1772,19 +1770,13 @@ sub psql
        }
    };
 
-   # Note: on Windows, IPC::Run seems to convert \r\n to \n in program output
-   # if we're using native Perl, but not if we're using MSys Perl.  So do it
-   # by hand in the latter case, here and elsewhere.
-
    if (defined $$stdout)
    {
-       $$stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        chomp $$stdout;
    }
 
    if (defined $$stderr)
    {
-       $$stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        chomp $$stderr;
    }
 
@@ -2261,9 +2253,7 @@ sub poll_query_until
        my $result = IPC::Run::run $cmd, '<', \$query,
          '>', \$stdout, '2>', \$stderr;
 
-       $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        chomp($stdout);
-       $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        chomp($stderr);
 
        if ($stdout eq $expected && $stderr eq '')
@@ -2717,9 +2707,6 @@ sub pg_recvlogical_upto
        }
    };
 
-   $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
-   $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
-
    if (wantarray)
    {
        return ($ret, $stdout, $stderr, $timeout);

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 7217b009e4b0a7a7449fa095c697cdbdfa5eee34..c0fcf7dc6640aec3073b26608f319fad5a91edcd 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -382,7 +382,6 @@ sub run_command
    my ($cmd) = @_;
    my ($stdout, $stderr);
    my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
-   foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
    chomp($stdout);
    chomp($stderr);
    return ($stdout, $stderr);
@@ -467,7 +466,6 @@ sub slurp_file
    $contents = <$fh>;
    close $fh;
 
-   $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
    return $contents;
 }
 
@@ -825,7 +823,6 @@ sub command_like
    my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
    ok($result, "$test_name: exit code 0");
    is($stderr, '', "$test_name: no stderr");
-   $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
    like($stdout, $expected_stdout, "$test_name: matches");
    return;
 }
@@ -878,7 +875,6 @@ sub command_fails_like
    print("# Running: " . join(" ", @{$cmd}) . "\n");
    my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
    ok(!$result, "$test_name: exit code not 0");
-   $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
    like($stderr, $expected_stderr, "$test_name: matches");
    return;
 }
@@ -923,8 +919,6 @@ sub command_checks_all
      if $ret & 127;
    $ret = $ret >> 8;
 
-   foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
-
    # check status
    ok($ret == $expected_ret,
        "$test_name status (got $ret vs expected $expected_ret)");

diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl
index fcff0a2febaa16b47e683fb523f312b678714416..fd2c0a305312abf3b9ecd1c97d6c5ceb243d1958 100644 (file)
--- a/src/test/recovery/t/021_row_visibility.pl
+++ b/src/test/recovery/t/021_row_visibility.pl
@@ -187,9 +187,6 @@ sub send_query_and_wait
    $$psql{run}->pump_nb();
    while (1)
    {
-       # See PostgresNode.pm's psql()
-       $$psql{stdout} =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
-
        last if $$psql{stdout} =~ /$untl/;
 
        if ($psql_timeout->is_expired)

diff --git a/src/test/recovery/t/cp_history_files b/src/test/recovery/t/cp_history_files
index 66f1b598fea81e70549a1a2727a822a663c10288..cfeea41e5b918ed51fe62878558c2f5401de4e32 100644 (file)
--- a/src/test/recovery/t/cp_history_files
+++ b/src/test/recovery/t/cp_history_files
@@ -7,11 +7,4 @@ use warnings;
 die "wrong number of arguments" if @ARGV != 2;
 my ($source, $target) = @ARGV;
 exit if $source !~ /history/;
-if ($^O eq 'msys')
-{
-    # make a windows path look like an msys path if necessary
-    $source =~ s!^([A-Za-z]):!'/' . lc($1)!e;
-    $source =~ s!\\!/!g;
-}
-
 copy($source, $target) or die "couldn't copy $source to $target: $!";