Refix the unaccent regression test on MSVC properly

petere · petere · commit 385942f46ce5 · 2011-04-19T22:52:52.000+03:00
... 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.
diff --git 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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,14 @@ sub fetchRegressOpts`
`228`	`228`	`# ignore anything that isn't an option staring with --`
`229`	`229`	`@opts = grep { $_ !~ /\$\(/ && $_ =~ /^--/ } split(/\s+/,$1);`
`230`	`230`	`}`
	`231`	`+ if ($m =~ /^\sENCODING\s=\s*(\S+)/m)`
	`232`	`+ {`
	`233`	`+ push @opts, "--encoding=$1";`
	`234`	`+ }`
	`235`	`+ if ($m =~ /^\sNO_LOCALE\s=\s*\S+/m)`
	`236`	`+ {`
	`237`	`+ push @opts, "--no-locale";`
	`238`	`+ }`
`231`	`239`	`return @opts;`
`232`	`240`	`}`
`233`	`241`