oops, some more test failures

diff --git a/t/cdbi-t/04-lazy.t b/t/cdbi-t/04-lazy.t
index b9e3370..69b3549 100644 (file)
--- a/t/cdbi-t/04-lazy.t
+++ b/t/cdbi-t/04-lazy.t
@@ -1,16 +1,17 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 24);
-}
 
 #----------------------------------------------------------------------
 # Test lazy loading
 #----------------------------------------------------------------------
 
 BEGIN {
+  eval "use DBIx::Class::CDBICompat;";
+  if ($@) {
+    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
+    next;
+  }
        eval "use DBD::SQLite";
        plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 25);
 }

diff --git a/t/cdbi-t/22-self_referential.t b/t/cdbi-t/22-self_referential.t
index c2ce6e1..c937746 100644 (file)
--- a/t/cdbi-t/22-self_referential.t
+++ b/t/cdbi-t/22-self_referential.t
@@ -2,7 +2,7 @@ use Test::More;
 \r
 BEGIN {\r
   eval "use DBIx::Class::CDBICompat;";\r
-  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 24);\r
+  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 2);\r
 }\r
 \r
 use strict;\r

diff --git a/t/cdbi-t/98-failure.t b/t/cdbi-t/98-failure.t
index d013d22..4521b9a 100644 (file)
--- a/t/cdbi-t/98-failure.t
+++ b/t/cdbi-t/98-failure.t
@@ -1,18 +1,18 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 24);
-}
-
 #----------------------------------------------------------------------
 # Test database failures
 #----------------------------------------------------------------------
 
 BEGIN {
-       eval "use DBD::SQLite";
-       plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 7);
+  eval "use DBIx::Class::CDBICompat;";
+  if ($@) {
+    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
+    next;
+  }
+  eval "use DBD::SQLite";
+  plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 7);
 }
 
 use lib 't/testlib';