Commit 31985208 authored by mkanat%kerio.com's avatar mkanat%kerio.com

Bug 286701: Tests fail compiling Bugzilla::DB::Pg.pm

Patch By Colin Ogilvie <colin.ogilvie@gmail.com> r=mkanat, a=justdave
parent 8656d280
...@@ -32,6 +32,10 @@ use Support::Files; ...@@ -32,6 +32,10 @@ use Support::Files;
use Test::More tests => scalar(@Support::Files::testitems); use Test::More tests => scalar(@Support::Files::testitems);
# Need this to get the available driver information
use DBI;
my @DBI_drivers = DBI->available_drivers;
# Bugzilla requires Perl 5.6.1 now. Checksetup will tell you this if you run it, but # Bugzilla requires Perl 5.6.1 now. Checksetup will tell you this if you run it, but
# it tests it in a polite/passive way that won't make it fail at compile time. We'll # it tests it in a polite/passive way that won't make it fail at compile time. We'll
# slip in a compile-time failure if it's missing here so a tinderbox on 5.00503 won't # slip in a compile-time failure if it's missing here so a tinderbox on 5.00503 won't
...@@ -60,6 +64,16 @@ my $perlapp = "\"$^X\""; ...@@ -60,6 +64,16 @@ my $perlapp = "\"$^X\"";
foreach my $file (@testitems) { foreach my $file (@testitems) {
$file =~ s/\s.*$//; # nuke everything after the first space (#comment) $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
next if (!$file); # skip null entries next if (!$file); # skip null entries
# Check that we have a DBI module to support the DB, if this is a database
# module (but not Schema)
if ($file =~ m#Bugzilla/DB/([^/]+)\.pm$# && $file ne "Bugzilla/DB/Schema.pm") {
if (!grep(lc($_) =~ /$1/i, @DBI_drivers)) {
ok(1,$file." - Skipping, as the DBD module not installed");
next;
}
}
open (FILE,$file); open (FILE,$file);
my $bang = <FILE>; my $bang = <FILE>;
close (FILE); close (FILE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment