X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02_thread.t;h=196cd0a3b130e09f5d75b58a871b032357258500;hb=192ddfb29b6066799540c78454f0bf4720f9c1dd;hp=bcf487887aad218578ad76acad95f54bfb324ebb;hpb=82ca1dd86de69da01a9f7f746785a29f6afcaa42;p=p5sagit%2FDevel-GlobalDestruction.git

diff --git a/t/02_thread.t b/t/02_thread.t
index bcf4878..196cd0a 100644
--- a/t/02_thread.t
+++ b/t/02_thread.t
@@ -24,19 +24,9 @@ use warnings;
 
 BEGIN {
   if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) {
-    no strict 'refs';
-    no warnings 'redefine';
-
-    for my $f (qw(DynaLoader::bootstrap XSLoader::load)) {
-      my ($mod) = $f =~ /^ (.+) \:\: [^:]+ $/x;
-      eval "require $mod" or die $@;
-
-      my $orig = \&$f;
-      *$f = sub {
-        die 'no XS' if ($_[0]||'') eq 'Devel::GlobalDestruction';
-        goto $orig;
-      };
-    }
+    unshift @INC, sub {
+      die 'no XS' if $_[1] eq 'Devel/GlobalDestruction/XS.pm';
+    };
   }
 }
 
@@ -51,8 +41,8 @@ sub do_test {
     die "Argument passing failed!";
   }
 
-  delete $INC{'t/01_basic.t'};
-  do 't/01_basic.t';
+  delete $INC{'./t/01_basic.t'};
+  do './t/01_basic.t';
 
   1;
 }