Commit98d3a7b

committed

MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

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

1 parent810f0d2 commit98d3a7bCopy full SHA for 98d3a7b

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

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

Comments

(0)