aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-04-19 22:52:52 +0300
committerPeter Eisentraut <peter_e@gmx.net>2011-04-19 22:52:52 +0300
commit385942f46ce526000d231c51c76360a807c2f809 (patch)
tree34e14810e726f9728ff3af5e23899c2b8dc2273b /src
parent2e8d9544752a7d68cb46f028a4f16ab0eb76c26e (diff)
downloadpostgresql-385942f46ce526000d231c51c76360a807c2f809.tar.gz
postgresql-385942f46ce526000d231c51c76360a807c2f809.zip
Refix the unaccent regression test on MSVC properly
... for some value of "properly". Instead of overriding REGRESS_OPTS, set the variables ENCODING and NO_LOCALE, which is more expressive and allows overriding by the user. Fix vcregress.pl to handle that.
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/vcregress.pl8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 8a100bf2ead..8c920b883a9 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -228,6 +228,14 @@ sub fetchRegressOpts
# ignore anything that isn't an option staring with --
@opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/,$1);
}
+ if ($m =~ /^\s*ENCODING\s*=\s*(\S+)/m)
+ {
+ push @opts, "--encoding=$1";
+ }
+ if ($m =~ /^\s*NO_LOCALE\s*=\s*\S+/m)
+ {
+ push @opts, "--no-locale";
+ }
return @opts;
}