MSVC: Substitute $(top_builddir) in REGRESS_OPTS.

Commit d7cdf6ee36adeac9233678fb8f2a112e6678a770 introduced a usage
thereof.  Back-patch to 9.0, like that commit.

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 2c8cd50a2f7af8a1e6968266ada4913ed356c6f2..d2fdf5c35c434c558c84c05dacca37a85c375f31 100644 (file)
--- 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)
        {