database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Refix the unaccent regression test on MSVC properly

Browse Source 
... 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.
This commit is contained in:
Peter Eisentraut
2011-04-19 22:52:52 +03:00
parent 2e8d954475
commit 385942f46c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/unaccent/Makefile
View File

@ -9,8 +9,9 @@ DATA_TSEARCH = unaccent.rules
REGRESS = unaccent REGRESS = unaccent
# Adjust REGRESS_OPTS because we need a UTF8 database # We need a UTF8 database
REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --encoding=UTF8 --no-locale ENCODING = UTF8
NO_LOCALE = 1
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config

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

@ -228,6 +228,14 @@ sub fetchRegressOpts
# ignore anything that isn't an option staring with -- # ignore anything that isn't an option staring with --
@opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/,$1); @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; return @opts;
} }