aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2010-03-02 17:06:51 +0000
committerAndrew Dunstan <andrew@dunslane.net>2010-03-02 17:06:51 +0000
commit4ab911da74827133bfa7073b55332ef8a5a652ea (patch)
tree02bdd09968c474583e039466951f2395c7ae22cc /src
parente664969f0f3b7dc557d9df9d30d03b7103f214a3 (diff)
downloadpostgresql-4ab911da74827133bfa7073b55332ef8a5a652ea.tar.gz
postgresql-4ab911da74827133bfa7073b55332ef8a5a652ea.zip
Do not run regression tests for contrib/xml2 on MSVC unless building with XML
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/vcregress.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 1869588e927..433f9ff7153 100644
--- 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 @@ 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}";
@@ -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");