Do not run regression tests for contrib/xml2 on MSVC unless building with XML

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 32e2548e976a3a107f3958b9b2b916d617dc9420..6191855cffac44633ea79748e6eb3f3275b2d62c 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -1,7 +1,7 @@
 
 # -*-perl-*- hey - emacs - this is a perl file
 
-# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.6 2007/11/13 22:49:47 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.6.2.1 2010/03/02 18:15:53 adunstan Exp $
 
 use strict;
 
@@ -14,6 +14,8 @@ my $startdir = getcwd();
 
 chdir "../../.." if (-d "../../../src/tools/msvc");
 
+require 'src/tools/msvc/config.pl';
+
 # buildenv.pl is for specifying the build environment settings
 # it should contian lines like:
 # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@@ -188,6 +190,7 @@ sub contribcheck
     my $mstat = 0;
     foreach my $module (glob("*"))
     {
+               next if ($module eq 'xml2' && ! $config->{xml});
         next unless -d "$module/sql" && 
                        -d "$module/expected" && 
                        (-f "$module/Makefile" || -f "$module/GNUmakefile");