MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

nmisch · nmisch · commit 31f9bbf05928 · 2014-07-23T00:35:07.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
@@ -331,9 +331,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
`@@ -331,9 +331,13 @@ sub fetchRegressOpts`
`331`	`331`	`if ($m =~ /^\sREGRESS_OPTS\s=(.*)/m)`
`332`	`332`	`{`
`333`	`333`
`334`		`- # ignore options that use makefile variables - can't handle those`
`335`		`- # ignore anything that isn't an option staring with --`
`336`		`- @opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/, $1);`
	`334`	`+ # Substitute known Makefile variables, then ignore options that retain`
	`335`	`+ # an unhandled variable reference. Ignore anything that isn't an`
	`336`	`+ # option starting with "--".`
	`337`	`+ @opts = grep {`
	`338`	`+ s/\Q$(top_builddir)\E/\"$topdir\"/;`
	`339`	`+ $_ !~ /\$\(/ && $_ =~ /^--/`
	`340`	`+ } split(/\s+/, $1);`
`337`	`341`	`}`
`338`	`342`	`if ($m =~ /^\sENCODING\s=\s*(\S+)/m)`
`339`	`343`	`{`