Recognize Makefile line continuations in fetchRegressOpts().

nmisch · nmisch · commit d710116c64ba · 2014-12-18T03:55:47.000-05:00
Back-patch to 9.0 (all supported versions). This is mere future-proofing in the context of the master branch, but commit f6dc6dd requires it of older branches.
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
@@ -330,6 +330,8 @@ sub fetchRegressOpts
 	my $m = <$handle>;
 	close($handle);
 	my @opts;
+
+	$m =~ s{\\\r?\n}{}g;
 	if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
 	{
 

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,8 @@ sub fetchRegressOpts`
`330`	`330`	`my $m = <$handle>;`
`331`	`331`	`close($handle);`
`332`	`332`	`my @opts;`
	`333`	`+`
	`334`	`+ $m =~ s{\\\r?\n}{}g;`
`333`	`335`	`if ($m =~ /^\sREGRESS_OPTS\s=(.*)/m)`
`334`	`336`	`{`
`335`	`337`