diff options
| author | Noah Misch <noah@leadboat.com> | 2014-07-23 00:35:07 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-07-23 00:35:49 -0400 |
| commit | 44acd17605032b7d32575b66f4c00ee0e2a7ab5f (patch) | |
| tree | d7d5e360238895f80a696f34a20e00c8a255b05c /src | |
| parent | 30d6a9858cd8389e59d652d9919761dc095326c5 (diff) | |
MSVC: Substitute $(top_builddir) in REGRESS_OPTS.
Commit d7cdf6ee36adeac9233678fb8f2a112e6678a770 introduced a usage
thereof. Back-patch to 9.0, like that commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 2c8cd50a2f7..d2fdf5c35c4 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -331,9 +331,13 @@ sub fetchRegressOpts if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m) { - # ignore options that use makefile variables - can't handle those - # ignore anything that isn't an option staring with -- - @opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/, $1); + # Substitute known Makefile variables, then ignore options that retain + # an unhandled variable reference. Ignore anything that isn't an + # option starting with "--". + @opts = grep { + s/\Q$(top_builddir)\E/\"$topdir\"/; + $_ !~ /\$\(/ && $_ =~ /^--/ + } split(/\s+/, $1); } if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m) { |