MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

nmisch · nmisch · commit 98d3a7b97e52 · 2014-07-23T00:35:57.000-04:00
Commit d7cdf6e introduced a usage thereof. Back-patch to 9.0, like that commit.
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
@@ -323,9 +323,13 @@ sub fetchRegressOpts
 	if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
 	{
 
-		# ignore options that use makefile variables - can't handle those
-		# ignore anything that isn't an option staring with --
-		@opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/, $1);
+		# Substitute known Makefile variables, then ignore options that retain
+		# an unhandled variable reference.  Ignore anything that isn't an
+		# option starting with "--".
+		@opts = grep {
+			s/\Q$(top_builddir)\E/\"$topdir\"/;
+			$_ !~ /\$\(/ && $_ =~ /^--/
+		} split(/\s+/, $1);
 	}
 	if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m)
 	{

Original file line number	Diff line number	Diff line change
`@@ -323,9 +323,13 @@ sub fetchRegressOpts`
`323`	`323`	`if ($m =~ /^\sREGRESS_OPTS\s=(.*)/m)`
`324`	`324`	`{`
`325`	`325`
`326`		`- # ignore options that use makefile variables - can't handle those`
`327`		`- # ignore anything that isn't an option staring with --`
`328`		`- @opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/, $1);`
	`326`	`+ # Substitute known Makefile variables, then ignore options that retain`
	`327`	`+ # an unhandled variable reference. Ignore anything that isn't an`
	`328`	`+ # option starting with "--".`
	`329`	`+ @opts = grep {`
	`330`	`+ s/\Q$(top_builddir)\E/\"$topdir\"/;`
	`331`	`+ $_ !~ /\$\(/ && $_ =~ /^--/`
	`332`	`+ } split(/\s+/, $1);`
`329`	`333`	`}`
`330`	`334`	`if ($m =~ /^\sENCODING\s=\s*(\S+)/m)`
`331`	`335`	`{`