Commitff85fc8

committed

Remove carriage returns from certain tap test output under Msys

These were causing spurious test failures.

1 parent2834855 commitff85fc8Copy full SHA for ff85fc8

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ sub psql`
`226`	`226`	`print("# Running SQL command:$sql\n");`
`227`	`227`	`run ['psql','-X','-A','-t','-q','-d',$dbname,'-f','-' ],'<', \$sql,'>', \$stdout,'2>', \$stderrordie;`
`228`	`228`	`chomp$stdout;`
	`229`	`+$stdout =~s/\r//gif$Config{osname}eq'msys';`
`229`	`230`	`return$stdout;`
`230`	`231`	`}`
`231`	`232`
`@@ -242,7 +243,9 @@ sub slurp_file`
`242`	`243`	`{`
`243`	`244`	`local$/;`
`244`	`245`	`local@ARGV =@_;`
`245`		`-<>`
	`246`	`+my$contents = <>;`
	`247`	`+$contents =~s/\r//gif$Config{osname}eq'msys';`
	`248`	`+return$contents;`
`246`	`249`	`}`
`247`	`250`
`248`	`251`	`subsystem_or_bail`

Comments

(0)