Commit48aa003

committed

MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

Commitd7cdf6e introduced a usagethereof. Back-patch to 9.0, like that commit.

1 parent3c5232a commit48aa003Copy full SHA for 48aa003

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

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`	`{`

Comments

(0)