Support::Files auf bin/mozilla angepasst und Bugzillaspezifische Tests entfernt.

diff --git a/t/001compile.t b/t/001compile.t
index 1053a6b07e607a716ac12db4316548ce2c59e95b..a81cd81deab48e187bda34dfa84a277dd6e18c2d 100644 (file)
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -27,16 +27,14 @@
 use strict;
 
 use lib 't';
 use strict;
 
 use lib 't';

-use lib '../modules/override';
-use lib '../modules/fallback';

 
 use Support::Files;
 
 use Test::More tests => scalar(@Support::Files::testitems);
 
 # Need this to get the available driver information
 
 use Support::Files;
 
 use Test::More tests => scalar(@Support::Files::testitems);
 
 # Need this to get the available driver information

-use DBI;
-my @DBI_drivers = DBI->available_drivers;
+#use DBI;
+#my @DBI_drivers = DBI->available_drivers;

 
 # Bugzilla requires Perl 5.8.0 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
 
 # Bugzilla requires Perl 5.8.0 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


@@ -67,21 +65,6 @@ foreach my $file (@testitems) {
     $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
     next if (!$file); # skip null entries
 
     $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
     next if (!$file); # skip null entries
 

-    # Skip mod_perl.pl in all cases. It doesn't compile correctly from the command line.
-    if ($file eq 'mod_perl.pl') {
-        ok(1, "Skipping mod_perl.pl");
-        next;
-    }
-
-    # 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);
     my $bang = <FILE>;
     close (FILE);
     open (FILE,$file);
     my $bang = <FILE>;
     close (FILE);

diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index e485561a35665a2c0c7954de3742685b6a333373..f325a0ae801b23accdb2d33e9fdd0f5864534206 100644 (file)
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -39,6 +39,7 @@ use File::Find;
 
 @files = glob('*');
 find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'SL');
 
 @files = glob('*');
 find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'SL');

+find(sub { push(@files, $File::Find::name) if $_ =~ /\.pl$/;}, 'bin/mozilla');

 
 sub have_pkg {
     my ($pkg) = @_;
 
 sub have_pkg {
     my ($pkg) = @_;