fix detection if loaded during global destruction

[p5sagit/Devel-GlobalDestruction.git] / t / 02_thread.t

diff --git a/t/02_thread.t b/t/02_thread.t
index ee4cf33..4a7b6d0 100644 (file)
--- a/t/02_thread.t
+++ b/t/02_thread.t
@@ -14,22 +14,38 @@ BEGIN {
 }
 
 use threads;
-use warnings;
+use threads::shared;
+
+our $had_error :shared;
+END { $? = $had_error||0 }
+
 use strict;
+use warnings;
 
 BEGIN {
-    if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) {
-        require DynaLoader;
-        no warnings 'redefine';
-        my $orig = \&DynaLoader::bootstrap;
-        *DynaLoader::bootstrap = sub {
-            die 'no XS' if $_[0] eq 'Devel::GlobalDestruction';
-            goto $orig;
-        };
-    }
+  if ($ENV{DEVEL_GLOBALDESTRUCTION_PP_TEST}) {
+    unshift @INC, sub {
+      die 'no XS' if $_[1] eq 'Devel/GlobalDestruction/XS.pm';
+    };
+  }
 }
 
-my $t = threads->create(sub { do 't/01_basic.t' });
-$t->join;
+# load it before spawning a thread, that's the whole point
+require Devel::GlobalDestruction;
+
+sub do_test {
+
+  # just die so we don't need to deal with testcount skew
+  unless ( ($_[0]||'') eq 'arg' ) {
+    $had_error++;
+    die "Argument passing failed!";
+  }
+
+  delete $INC{'t/01_basic.t'};
+  do 't/01_basic.t';
+
+  1;
+}
 
-exit 0;
+threads->create('do_test', 'arg')->join
+  or $had_error++;