summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2007-09-24 21:42:34 +0000
committerAndrew Dunstan2007-09-24 21:42:34 +0000
commitc66d00984cc908d1a5469ac84fa6f0f361f6c8d5 (patch)
tree5a2bd0dc92c142a9d9ec012c0e04447d7f6469d4
parentc841393359ffa19aa4d766f2602f1d62f300de02 (diff)
Use proper search for contrib makefiles in vcregress.pl
-rw-r--r--src/tools/msvc/vcregress.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 30e018e7d4..e285ab33fd 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -188,7 +188,9 @@ sub contribcheck
my $mstat = 0;
foreach my $module (glob("*"))
{
- next unless -d "$module/sql" && -d "$module/expected" && -f "Makefile";
+ next unless -d "$module/sql" &&
+ -d "$module/expected" &&
+ (-f "$module/Makefile" || -f "$module/GNUmakefile");
chdir $module;
print "============================================================\n";
print "Checking $module\n";
@@ -211,7 +213,7 @@ sub fetchTests
my $handle;
open($handle,"<Makefile")
- || open($handle,"<GNUMakefile")
+ || open($handle,"<GNUmakefile")
|| die "Could not open Makefile";
local($/) = undef;
my $m = <$handle>;