X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02_standalone_test_classes.t;h=38278c0a7211cec0119a706469b0b0c621a5c05c;hb=052a832c5f6fe0f82a4db48e176525f700c44159;hp=55df0df3d2484d90ffc0238b69b65a11be62a970;hpb=79061be1316b4ac2aa25e60ef51dd8ffbd4e9132;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/02_standalone_test_classes.t b/t/02_standalone_test_classes.t
index 55df0df..38278c0 100644
--- a/t/02_standalone_test_classes.t
+++ b/t/02_standalone_test_classes.t
@@ -4,6 +4,8 @@ use strict;
 use Test::More;
 use File::Find;
 
+use DBIx::Class::_Util 'sigwarn_silencer';
+
 use lib 't/lib';
 
 find({
@@ -16,12 +18,12 @@ find({
       die "fork failed: $!"
     }
     elsif (!$pid) {
-      if (my @offenders = grep { $_ =~ /(^|\/)DBI/ } keys %INC) {
+      if (my @offenders = grep { $_ ne 'DBIx/Class/_Util.pm' } grep { $_ =~ /(^|\/)DBI/ } keys %INC) {
         die "Wtf - DBI* modules present in %INC: @offenders";
       }
 
-      local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /\bdeprecated\b/i };
-      require( ($_ =~ /(.+)/)[0] ); # untaint
+      local $SIG{__WARN__} = sigwarn_silencer( qr/\bdeprecated\b/i );
+      require( ( $_ =~ m| t/lib/ (.+) |x )[0] ); # untaint and strip lib-part (. is unavailable under -T)
       exit 0;
     }