X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faccessors_xs.t;h=54d8a1ff24770c4003e331d6c25d1b90635ce1ba;hb=1ed25f9e8d107a7311c579da0d23afa253c01268;hp=c7f9de4502b74c8658927297cf91d0d4bcd5e126;hpb=e6f2993f0eaf4c08632889be16acd8dada42fb6c;p=p5sagit%2FClass-Accessor-Grouped.git

diff --git a/t/accessors_xs.t b/t/accessors_xs.t
index c7f9de4..54d8a1f 100644
--- a/t/accessors_xs.t
+++ b/t/accessors_xs.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
@@ -7,25 +16,36 @@ use Test::More;
 use lib 't/lib';
 
 BEGIN {
-    require Class::Accessor::Grouped;
-    my $xsa_ver = $Class::Accessor::Grouped::__minimum_xsa_version;
-    eval {
-        require Class::XSAccessor;
-        Class::XSAccessor->VERSION ($xsa_ver);
-    };
-    plan skip_all => "Class::XSAccessor >= $xsa_ver not available"
-      if $@;
+  plan skip_all => "Sub::Name not available"
+    unless eval { require Sub::Name };
+
+  require Class::Accessor::Grouped;
+
+  my $xsa_ver = $Class::Accessor::Grouped::__minimum_xsa_version;
+  eval {
+    require Class::XSAccessor;
+    Class::XSAccessor->VERSION ($xsa_ver);
+  };
+  plan skip_all => "Class::XSAccessor >= $xsa_ver not available"
+    if $@;
 }
 
 # rerun the regular 3 tests under XSAccessor
+our $SUBTESTING = 1;
 $Class::Accessor::Grouped::USE_XS = 1;
+
 for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t/) {
 
-  subtest "$tname with USE_XS (pass $_)" => sub {
+  my $pass = 1;
+  share($pass) if $has_threads;
+
+  my $todo = sub {
+    note "\nTesting $tname with USE_XS (pass @{[ $pass++ ]})\n\n";
+
     my $tfn = catfile($Bin, $tname);
 
     for (
-      qw|AccessorGroups.pm AccessorGroups/BeenThereDoneThat.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsWO.pm|,
+      qw|AccessorGroups.pm AccessorGroups/BeenThereDoneThat.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsParent.pm AccessorGroupsWO.pm|,
       File::Spec::Unix->catfile ($tfn),
     ) {
       delete $INC{$_};
@@ -38,8 +58,19 @@ for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t/) {
     local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /subroutine .+ redefined/i };
 
     do($tfn);
+  };
 
-  } for (1 .. 2);
+  if ($has_threads) {
+    threads->create(sub {
+      threads->create(sub {
+        $todo->() for (1,2) }
+      )->join;
+      $todo->() for (1,2);
+    })->join for (1,2)
+  }
+  else {
+    $todo->() for (1, 2);
+  }
 }
 
 done_testing;