NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit938d797

committed

Avoid odd portability problem in TestLib.pm's slurp_file function.

For unclear reasons, this function doesn't always read the expected datain some old Perl versions. Rewriting it to avoid use of ARGV seems tododge the problem, and this version is clearer anyway if you ask me.In passing, also improve error message in adjacent append_to_file function.

1 parentd5563d7 commit938d797Copy full SHA for 938d797

File tree

1 file changed

-4

lines changed

src/test/perl
- TestLib.pm

1 file changed

-4

lines changed

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

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,18 +158,21 @@ sub slurp_dir`
`158`	`158`
`159`	`159`	`subslurp_file`
`160`	`160`	`{`
	`161`	`+my ($filename) =@_;`
`161`	`162`	`local$/;`
`162`		`-local@ARGV =@_;`
`163`		`-my$contents = <>;`
	`163`	`+open(my$in,'<',$filename)`
	`164`	`+ordie"could not read\"$filename\":$!";`
	`165`	`+my$contents = <$in>;`
	`166`	`+close$in;`
`164`	`167`	`$contents =~s/\r//gif$Config{osname}eq'msys';`
`165`	`168`	`return$contents;`
`166`	`169`	`}`
`167`	`170`
`168`	`171`	`subappend_to_file`
`169`	`172`	`{`
`170`	`173`	`my ($filename,$str) =@_;`
`171`		`-`
`172`		`-openmy$fh,">>",$filenameordie"could notopen\"$filename\":$!";`
	`174`	`+openmy$fh,">>",$filename`
	`175`	`+ordie"could notwrite\"$filename\":$!";`
`173`	`176`	`print$fh$str;`
`174`	`177`	`close$fh;`
`175`	`178`	`}`

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!

Commit938d797

File tree

1 file changed

1 file changed

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

0 commit comments