NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0d91c52

committed

Fix places in TestLib.pm in need of adaptation to the output of Msys perl

Contrary to the output of native perl, Msys perl generates outputs withCRLFs characters. There are already places in the TAP code where CRLFs(\r\n) are automatically converted to LF (\n) on Msys, but we missed acouple of places when running commands and using their output forcomparison, that would lead to failures.This problem has been found thanks to the test added in5adb067 usingTestLib::command_checks_all(), but after a closer look more code pathswere missing a filter.This is backpatched all the way down to prevent any surprises if a newtest is introduced in stable branches.Reviewed-by: Andrew Dunstan, Álvaro HerreraDiscussion:https://postgr.es/m/1252480.1631829409@sss.pgh.pa.usBackpatch-through: 9.6

1 parent4476bcb commit0d91c52Copy full SHA for 0d91c52

File tree

1 file changed

-0

lines changed

src/test/perl
- TestLib.pm

1 file changed

-0

lines changed

`‎src/test/perl/TestLib.pm`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,7 @@ sub run_command`
`434`	`434`	`my ($cmd) =@_;`
`435`	`435`	`my ($stdout,$stderr);`
`436`	`436`	`my$result = IPC::Run::run$cmd,'>', \$stdout,'2>', \$stderr;`
	`437`	`+foreach ($stderr,$stdout) {s/\r\n/\n/gif$Config{osname}eq'msys'; }`
`437`	`438`	`chomp($stdout);`
`438`	`439`	`chomp($stderr);`
`439`	`440`	`return ($stdout,$stderr);`
`@@ -878,6 +879,7 @@ sub command_like`
`878`	`879`	`my$result = IPC::Run::run$cmd,'>', \$stdout,'2>', \$stderr;`
`879`	`880`	`ok($result,"$test_name: exit code 0");`
`880`	`881`	`is($stderr,'',"$test_name: no stderr");`
	`882`	`+$stdout =~s/\r\n/\n/gif$Config{osname}eq'msys';`
`881`	`883`	`like($stdout,$expected_stdout,"$test_name: matches");`
`882`	`884`	`return;`
`883`	`885`	`}`
`@@ -930,6 +932,7 @@ sub command_fails_like`
`930`	`932`	`print("# Running:" .join("", @{$cmd}) ."\n");`
`931`	`933`	`my$result = IPC::Run::run$cmd,'>', \$stdout,'2>', \$stderr;`
`932`	`934`	`ok(!$result,"$test_name: exit code not 0");`
	`935`	`+$stderr =~s/\r\n/\n/gif$Config{osname}eq'msys';`
`933`	`936`	`like($stderr,$expected_stderr,"$test_name: matches");`
`934`	`937`	`return;`
`935`	`938`	`}`
`@@ -974,6 +977,8 @@ sub command_checks_all`
`974`	`977`	`if$ret & 127;`
`975`	`978`	`$ret =$ret >> 8;`
`976`	`979`
	`980`	`+foreach ($stderr,$stdout) {s/\r\n/\n/gif$Config{osname}eq'msys'; }`
	`981`	`+`
`977`	`982`	`# check status`
`978`	`983`	`ok($ret ==$expected_ret,`
`979`	`984`	`"$test_name status (got$ret vs expected$expected_ret)");`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0d91c52

File tree

1 file changed

1 file changed

`‎src/test/perl/TestLib.pm`

0 commit comments