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 eb48a3fb83aa0d4eea2262078b6eb56dabdd4847..cf2bdfdf25fa1121654813b75235eac61b4d4552 100644 (file)
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -42,16 +42,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 506e103f7940195277384f004d414ee4f90fec93..85e1009f860ccabaa8f2c0df234ea695606034c5 100644 (file)
--- a/src/bin/pg_rewind/t/RewindTest.pm
+++ b/src/bin/pg_rewind/t/RewindTest.pm
@@ -113,7 +113,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 3652ca6a2d5e7b6d60865c19546ec5ff5086f3d6..556052f6c6bf55cecb09a8878f829e248d213748 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -805,9 +805,7 @@ sub kill9
        my $name = $self->name;
        return unless defined $self->{_pid};
        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;
 }
@@ -1468,19 +1466,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;
        }
 
@@ -1770,9 +1762,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 '')
@@ -2219,9 +2209,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 04f5c8ec663c97f48d212e6b48c8013ff663f375..74b7e6e06e9439fd4fb33087450d956349a080e4 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -289,7 +289,6 @@ sub slurp_file
        $contents = <$fh>;
        close $fh;
 
-       $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
        return $contents;
 }
 
@@ -518,7 +517,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;
 }
@@ -550,7 +548,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;
 }
@@ -577,8 +574,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: $!";