mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-02 15:17:19 +02:00
MSVC: Substitute $(top_builddir) in REGRESS_OPTS.
Commit d7cdf6ee36
introduced a usage
thereof. Back-patch to 9.0, like that commit.
This commit is contained in:
parent
30d6a9858c
commit
44acd17605
@ -331,9 +331,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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user