MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

nmisch · nmisch · commit 48aa0032c454 · 2014-07-23T00:36:21.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
@@ -249,9 +249,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
`@@ -249,9 +249,13 @@ sub fetchRegressOpts`
`249`	`249`	`if ($m =~ /^\sREGRESS_OPTS\s=(.*)/m)`
`250`	`250`	`{`
`251`	`251`
`252`		`- # ignore options that use makefile variables - can't handle those`
`253`		`- # ignore anything that isn't an option staring with --`
`254`		`- @opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/,$1);`
	`252`	`+ # Substitute known Makefile variables, then ignore options that retain`
	`253`	`+ # an unhandled variable reference. Ignore anything that isn't an`
	`254`	`+ # option starting with "--".`
	`255`	`+ @opts = grep {`
	`256`	`+ s/\Q$(top_builddir)\E/\"$topdir\"/;`
	`257`	`+ $_ !~ /\$\(/ && $_ =~ /^--/`
	`258`	`+ } split(/\s+/, $1);`
`255`	`259`	`}`
`256`	`260`	`if ($m =~ /^\sENCODING\s=\s*(\S+)/m)`
`257`	`261`	`{`