summaryrefslogtreecommitdiff
path: root/src/test/perl/TestLib.pm
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2022-02-20 11:49:33 -0500
committerAndrew Dunstan <andrew@dunslane.net>2022-02-20 11:49:33 -0500
commita5716baac00b68e6cf0720047dddfe8892c8033e (patch)
tree138402b4337512b685bbda3093b6a1a51b1e63a9 /src/test/perl/TestLib.pm
parentc27aa21e0dc89484fec38cd4e2189c6c1a5cf251 (diff)
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
Diffstat (limited to 'src/test/perl/TestLib.pm')
-rw-r--r--src/test/perl/TestLib.pm6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 2a9c8c6df6f..57301514577 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -365,7 +365,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);
@@ -450,7 +449,6 @@ sub slurp_file
$contents = <$fh>;
close $fh;
- $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
return $contents;
}
@@ -776,7 +774,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;
}
@@ -829,7 +826,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;
}
@@ -874,8 +870,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)");