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 eb01a32c6194906119225ac2a41c2b0d0f830ba2..793f3f9ea2ce242cd38ff370635611ac07cb7939 100644 (file)
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -37,16 +37,7 @@ close $conf;
 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 124d747572bd2cdedbe7db95a9ecdbdcfebda4d5..85555a25763784cb72c47540e1dc3939a7ad9078 100644 (file)
--- a/src/bin/pg_rewind/t/RewindTest.pm
+++ b/src/bin/pg_rewind/t/RewindTest.pm
@@ -107,7 +107,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");
    }
 }

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index dafde431deac773d3ada568f2bd67e6f970c7cf7..099d4981e5e21c7d4304f34ca2d11257c1e0b0e6 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -758,7 +758,7 @@ sub kill9
    my $name = $self->name;
    return unless defined $self->{_pid};
    print "### Killing node \"$name\" using signal 9\n";
-   kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed");
+   kill(9, $self->{_pid});
    $self->{_pid} = undef;
    return;
 }
@@ -1349,19 +1349,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;
    }
 
@@ -1651,9 +1645,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 '')
@@ -2084,9 +2076,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 c88037438daabe39ef79374f1ac56f79cc597565..6a738ba8b953e05bd882f67ec1b64e8378b92474 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -282,7 +282,6 @@ sub slurp_file
    $contents = <$fh>;
    close $fh;
 
-   $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
    return $contents;
 }
 
@@ -377,7 +376,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");
 }
 
@@ -407,7 +405,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");
 }
 
@@ -433,8 +430,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/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: $!";