diff options
| author | Peter Eisentraut | 2011-04-19 19:52:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2011-04-19 19:52:52 +0000 |
| commit | 385942f46ce526000d231c51c76360a807c2f809 (patch) | |
| tree | 34e14810e726f9728ff3af5e23899c2b8dc2273b | |
| parent | 2e8d9544752a7d68cb46f028a4f16ab0eb76c26e (diff) | |
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.
| -rw-r--r-- | contrib/unaccent/Makefile | 5 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 4ee2c685c8..f0be62db53 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -9,8 +9,9 @@ DATA_TSEARCH = unaccent.rules REGRESS = unaccent -# Adjust REGRESS_OPTS because we need a UTF8 database -REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --encoding=UTF8 --no-locale +# We need a UTF8 database +ENCODING = UTF8 +NO_LOCALE = 1 ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 8a100bf2ea..8c920b883a 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; } |