Extend the $? fix from 6d3e0a6f to the threadtest, make things more robust

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

diff --git a/t/02_thread.t b/t/02_thread.t
index 0f26b0a..9032546 100644 (file)
--- a/t/02_thread.t
+++ b/t/02_thread.t
@@ -14,10 +14,42 @@ 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;
+    };
+  }
+}
+
+# load it before spawning a thread, that's the whole point
+require Devel::GlobalDestruction;
 
-my $t = threads->create(sub { do 't/01_basic.t' });
-$t->join;
+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++;