Commitf12976a

committed

MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

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

1 parent6306d07 commitf12976aCopy full SHA for f12976a

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

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

Comments

(0)