summaryrefslogtreecommitdiff
path: root/src/test/perl/TestLib.pm
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2022-02-19 11:28:35 -0500
committerAndrew Dunstan <andrew@dunslane.net>2022-02-20 11:44:01 -0500
commit2b02cadb5cbc4645adf0f8f7297d633e01258ee2 (patch)
tree1ae71a04f431416c9482e99a78d408aa8d649b01 /src/test/perl/TestLib.pm
parentb30c62bd42ebdee366919b9cfcf62a489031b571 (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.pm5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index c88037438da..6a738ba8b95 100644
--- 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)");