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:57 -0400 |
| commit | 98d3a7b97e5221b6ca43cb4de07000675f207b00 (patch) | |
| tree | 86aac8d4644a01a28e3aecc17742752871782800 | |
| parent | 810f0d2a2dfa3c11baa68866045a85f708e69a3e (diff) | |
MSVC: Substitute $(top_builddir) in REGRESS_OPTS.
Commit d7cdf6ee36adeac9233678fb8f2a112e6678a770 introduced a usage
thereof. Back-patch to 9.0, like that commit.
| -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 08e94ffa576..d6ab91782c6 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -323,9 +323,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) { |