1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Perl code which had broken the Windows build

Browse Source 
The previous change wanted to avoid modifying $_ in grep, but the code
just made the change in a local variable and then lost it.  Rewrite the
code using a separate map and grep, which is clearer anyway.

Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
This commit is contained in:
Peter Eisentraut 2017-03-28 09:00:59 -04:00
parent a6f22e8356
commit 4d33a7f2e7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/msvc/vcregress.pl
View File

@ -520,11 +520,9 @@ sub fetchRegressOpts
# Substitute known Makefile variables, then ignore options that retain # Substitute known Makefile variables, then ignore options that retain
# an unhandled variable reference. Ignore anything that isn't an # an unhandled variable reference. Ignore anything that isn't an
# option starting with "--". # option starting with "--".
@opts = grep { @opts = grep { !/\$\(/ && /^--/ }
my $x = $_; map { (my $x = $_) =~ s/\Q$(top_builddir)\E/\"$topdir\"/; $x; }
$x =~ s/\Q$(top_builddir)\E/\"$topdir\"/; split(/\s+/, $1);
$x !~ /\$\(/ && $x =~ /^--/
} split(/\s+/, $1);
} }
if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m) if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m)
{ {