Bug 1246528 - Use Makefile.PL and allow Bugzilla use cpanm-compatible local dependencies

r=dkl,a=dylan

13 files changed, 14 insertions, 15 deletions

diff --git a/t/001compile.t b/t/001compile.t
index a546e40ad..da95b7327 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -14,7 +14,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 use Config;
 use Support::Files;
 use Test::More tests => scalar(@Support::Files::testitems)
@@ -86,8 +86,7 @@ foreach my $file (@testitems) {
             and $file ne "Bugzilla/DB/Schema.pm") 
         {
             my $module = lc($1);
-            my $dbd = DB_MODULE->{$module}->{dbd}->{module};
-            eval("use $dbd; 1") or skip "$file: $dbd not installed", 1;
+            Bugzilla->feature($module) or skip "$file: Driver for $module not installed", 1;
         }
 
         compile_file($file);
diff --git a/t/002goodperl.t b/t/002goodperl.t
index cfc9fb9e9..7b2e74acc 100644
--- a/t/002goodperl.t
+++ b/t/002goodperl.t
@@ -14,7 +14,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 
diff --git a/t/004template.t b/t/004template.t
index ce45cfec1..909f1a231 100644
--- a/t/004template.t
+++ b/t/004template.t
@@ -13,7 +13,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Templates;
 
diff --git a/t/005whitespace.t b/t/005whitespace.t
index b6de8cee3..be13890bb 100644
--- a/t/005whitespace.t
+++ b/t/005whitespace.t
@@ -13,7 +13,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Support::Templates;
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index 24e00242d..2f6dbbf76 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
@@ -14,7 +14,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 use Support::Files;
 
 # -1 because 006spellcheck.t must not be checked.
diff --git a/t/007util.t b/t/007util.t
index 66c2df032..b8e9505d8 100644
--- a/t/007util.t
+++ b/t/007util.t
@@ -13,7 +13,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 use Support::Files;
 use Test::More tests => 17;
 use DateTime;
diff --git a/t/008filter.t b/t/008filter.t
index 1f5219f71..65fecfb1f 100644
--- a/t/008filter.t
+++ b/t/008filter.t
@@ -19,7 +19,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Bugzilla::Constants;
 use Support::Templates;
diff --git a/t/009bugwords.t b/t/009bugwords.t
index e36651edb..740cbf6aa 100644
--- a/t/009bugwords.t
+++ b/t/009bugwords.t
@@ -19,7 +19,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Support::Templates;
diff --git a/t/010dependencies.t b/t/010dependencies.t
index afd29a652..777d42ed1 100644
--- a/t/010dependencies.t
+++ b/t/010dependencies.t
@@ -14,7 +14,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Test::More qw(no_plan);
diff --git a/t/011pod.t b/t/011pod.t
index 193435d4e..380b866c9 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -14,7 +14,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Pod::Checker;
diff --git a/t/012throwables.t b/t/012throwables.t
index 0ef043fa5..cb00eaf78 100644
--- a/t/012throwables.t
+++ b/t/012throwables.t
@@ -15,7 +15,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Bugzilla::Constants;
 use Bugzilla::WebService::Constants;
diff --git a/t/013dbschema.t b/t/013dbschema.t
index 217176ff2..8313444d7 100644
--- a/t/013dbschema.t
+++ b/t/013dbschema.t
@@ -16,7 +16,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. t lib);
+use lib qw(. lib local/lib/perl5 t);
 use Bugzilla;
 use Bugzilla::DB::Schema;
 
diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index f1c88e858..39bacccfc 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -18,7 +18,7 @@ our @additional_files = ();
 
 our @files = glob('*');
 find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, qw(Bugzilla docs));
-push(@files, 'extensions/create.pl', 'docs/makedocs.pl');
+push(@files, 'extensions/create.pl', 'docs/makedocs.pl', 'cpanfile');
 
 our @extensions =
     grep { $_ ne 'extensions/create.pl' && ! -e "$_/disabled" }