X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faccessors_pp.t;h=d97e3fa46201f10c8214fdf757cacee2e9ba4724;hb=270b8b0ff6a3a40932caa937459e884904d9dd49;hp=cb89232666cea37f64c55a3f5140a0a98968a8e1;hpb=e4cb632058a1584cd2727d5f7fc98dbeb6728aea;p=p5sagit%2FClass-Accessor-Grouped.git

diff --git a/t/accessors_pp.t b/t/accessors_pp.t
index cb89232..d97e3fa 100644
--- a/t/accessors_pp.t
+++ b/t/accessors_pp.t
@@ -1,5 +1,14 @@
+my $has_threads;
+BEGIN { eval '
+  use 5.008001;
+  use threads;
+  use threads::shared;
+  $has_threads = 1;
+' }
+
 use strict;
 use warnings;
+no warnings 'once';
 use FindBin qw($Bin);
 use File::Spec::Functions;
 use File::Spec::Unix (); # need this for %INC munging
@@ -20,22 +29,72 @@ BEGIN {
   require Class::Accessor::Grouped;
 }
 
+
 # rerun the regular 3 tests under the assumption of no Sub::Name
-for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t clean_namespace.t/) {
+our $SUBTESTING = 1;
+for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t/) {
+
+  my $pass = 1;
+  share($pass) if $has_threads;
 
-  subtest "$tname without Sub::Name (pass $_)" => sub {
-    my $tfn = catfile($Bin, $tname);
+  my $todo = sub {
+    note "\nTesting $tname without Sub::Name (pass @{[ $pass ++ ]})\n\n";
 
-    delete $INC{$_} for (
-      qw/AccessorGroups.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsWO.pm/,
+    my ($tfn) = catfile($Bin, $tname) =~ /(.+)/;
+
+    for (
+      qw|AccessorGroups.pm AccessorGroups/BeenThereDoneThat.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsParent.pm AccessorGroupsWO.pm|,
       File::Spec::Unix->catfile ($tfn),
-    );
+    ) {
+      delete $INC{$_};
+      no strict 'refs';
+      if (my ($mod) = $_ =~ /(.+)\.pm$/ ) {
+        %{"${mod}::"} = ();
+      }
+    }
 
     local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /subroutine .+ redefined/i };
 
     do($tfn);
 
-  } for (1 .. 2);
+    666;
+  };
+
+  if ($has_threads) {
+    for (1,2) {
+      is (
+        threads->create(sub {
+
+          # nested threading of this sort badly blows up on 5.10.0 (fixed with 5.10.1)
+          unless ($] > 5.009 and $] < 5.010001) {
+            is (
+
+              threads->create(sub {
+                $todo->();
+              })->join,
+
+              666,
+
+              'Innner thread joined ok',
+            );
+
+            is ($todo->(), 666, "Intermediate result ok");
+          }
+
+          return 777;
+        })->join,
+
+        777,
+
+        'Outer thread joined ok',
+      );
+
+      is ($todo->(), 666, "Unthreaded run ok") for (1,2);
+    }
+  }
+  else {
+    is ($todo->(), 666, "Unthreaded run ok") for (1,2);
+  }
 }
 
 done_testing;