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

adunstan · adunstan · commit 4ab911da7482 · 2010-03-02T17:06:51.000Z
diff --git 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.13 2010/01/09 15:25:41 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.14 2010/03/02 17:06:51 adunstan Exp $
 
 use strict;
 
@@ -14,6 +14,8 @@
 
 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}";
@@ -190,6 +192,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/GNUmakefile" || -f "$module/Makefile");
