Skip to content
Snippets Groups Projects
Commit 98d3a7b9 authored by Noah Misch's avatar Noah Misch
Browse files

MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

Commit d7cdf6ee introduced a usage
thereof.  Back-patch to 9.0, like that commit.
parent 810f0d2a
No related branches found
No related tags found
No related merge requests found
...@@ -323,9 +323,13 @@ sub fetchRegressOpts ...@@ -323,9 +323,13 @@ sub fetchRegressOpts
if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m) if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
{ {
# ignore options that use makefile variables - can't handle those # Substitute known Makefile variables, then ignore options that retain
# ignore anything that isn't an option staring with -- # an unhandled variable reference. Ignore anything that isn't an
@opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/, $1); # option starting with "--".
@opts = grep {
s/\Q$(top_builddir)\E/\"$topdir\"/;
$_ !~ /\$\(/ && $_ =~ /^--/
} split(/\s+/, $1);
} }
if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m) if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment