more specific warning filter for loading DBD::InterBase

diff --git a/t/18firebird_common.t b/t/18firebird_common.t
index eb42cde..cd1014e 100644 (file)
--- a/t/18firebird_common.t
+++ b/t/18firebird_common.t
@@ -172,8 +172,8 @@ if (not ($dbd_interbase_dsn || $odbc_dsn)) {
 else {
     # get rid of stupid warning from InterBase/GetInfo.pm
     if ($dbd_interbase_dsn) {
-        # FIXME - need to remove blind trap (can not test firebird yet)
-        local $SIG{__WARN__} = sub {};
+        local $SIG{__WARN__} = sub { warn @_
+            unless $_[0] =~ m|^Use of uninitialized value in sprintf at \S+DBD/InterBase/GetInfo\.pm line \d+\.$| };
         require DBD::InterBase;
         require DBD::InterBase::GetInfo;
     }
@@ -192,3 +192,4 @@ sub cleanup_extra {
         eval { $dbh->do($stmt) };
     }
 }
+# vim:et sts=4 sw=4 tw=0:

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index 3503ebf..da0b163 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -290,7 +290,7 @@ sub setup_schema {
         }
     }
 
-    exit if $file_count != $expected_count;
+    exit if ($file_count||0) != $expected_count;
    
     return $schema_class;
 }