[Bast-commits] r7979 - in branches/DBIx-Class-Schema-Loader/back-compat: lib/DBIx/Class/Schema/Loader t/lib

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-11-29 05:03:34 +0000 (Sun, 29 Nov 2009)
New Revision: 7979

Modified:
   branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm
   branches/DBIx-Class-Schema-Loader/back-compat/t/lib/dbixcsl_common_tests.pm
Log:
fix regular common tests

Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm	2009-11-29 04:30:08 UTC (rev 7978)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm	2009-11-29 05:03:34 UTC (rev 7979)
@@ -439,7 +439,11 @@
         or croak "Failed to close $real_inc_path: $!";
 
 # load the class too
-    do $real_inc_path;
+    {
+        # turn off redefined warnings
+        $SIG{__WARN__} = sub {};
+        do $real_inc_path;
+    }
     die $@ if $@;
 }
 

Modified: branches/DBIx-Class-Schema-Loader/back-compat/t/lib/dbixcsl_common_tests.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/t/lib/dbixcsl_common_tests.pm	2009-11-29 04:30:08 UTC (rev 7978)
+++ branches/DBIx-Class-Schema-Loader/back-compat/t/lib/dbixcsl_common_tests.pm	2009-11-29 05:03:34 UTC (rev 7979)
@@ -118,7 +118,7 @@
        is $file_count, 34, 'correct number of files generated';
        exit if $file_count != 34;
 
-       my $warn_count = 2;
+       my $warn_count = 0;
        $warn_count++ if grep /ResultSetManager/, @loader_warnings;
 
         if($self->{skip_rels}) {