Commit31f9bbf

committed

MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

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

1 parent2704898 commit31f9bbfCopy full SHA for 31f9bbf

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

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

Comments

(0)