Update VPIT::TestHelpers to 3ba261a5

[perl/modules/indirect.git] / t / 09-load-threads.t

diff --git a/t/09-load-threads.t b/t/09-load-threads.t
index 4652ab9f7d489da70bf7fe3381176df6a0be7904..26c061dc49f38ffea5d315222e1f3193c1e79b20 100644 (file)
--- a/t/09-load-threads.t
+++ b/t/09-load-threads.t
@@ -3,9 +3,6 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use VPIT::TestHelpers;
-
 BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
 my ($module, $thread_safe_var);
@@ -32,33 +29,12 @@ sub load_test {
 
 # Keep the rest of the file untouched
 
-BEGIN {
- my $is_threadsafe;
-
- if (defined $thread_safe_var) {
-  my $stat = run_perl "require POSIX; require $module; exit($thread_safe_var ? POSIX::EXIT_SUCCESS() : POSIX::EXIT_FAILURE())";
-  if (defined $stat) {
-   require POSIX;
-   my $res  = $stat >> 8;
-   if ($res == POSIX::EXIT_SUCCESS()) {
-    $is_threadsafe = 1;
-   } elsif ($res == POSIX::EXIT_FAILURE()) {
-    $is_threadsafe = !1;
-   }
-  }
-  if (not defined $is_threadsafe) {
-   skip_all "Could not detect if $module is thread safe or not";
-  }
- }
-
- VPIT::TestHelpers->import(
-  threads => [ $module => $is_threadsafe ],
- )
-}
+use lib 't/lib';
+use VPIT::TestHelpers threads => [ $module, $thread_safe_var ];
 
 my $could_not_create_thread = 'Could not create thread';
 
-use Test::Leaner tests => 1 + (2 + 2 * 2) + 6 + (2 * 4) + 2;
+use Test::Leaner tests => 1 + (2 + 2 * 2) + 6 + (2 * 4 + 1) * 2 + 1;
 
 sub is_loaded {
  my ($affirmative, $desc) = @_;
@@ -74,8 +50,11 @@ sub is_loaded {
   $desc     = "$desc: module not loaded";
  }
 
- is($res, $expected, $desc)
-               or diag("Test '$desc' failed: got '$res', expected '$expected'");
+ unless (is $res, $expected, $desc) {
+  $res      = defined $res ? "'$res'" : 'undef';
+  $expected = "'$expected'";
+  diag("Test '$desc' failed: got $res, expected $expected");
+ }
 
  return;
 }
@@ -182,14 +161,18 @@ is_loaded 0, 'main body, after nested loadings';
 use threads;
 use threads::shared;
 
-my @locks_down = (1) x 6;
-my @locks_up   = (0) x scalar @locks_down;
+my $sync_points = 7;
+
+my @locks_down = (1) x $sync_points;
+my @locks_up   = (0) x $sync_points;
 share($_) for @locks_down, @locks_up;
 
-my $peers = 2;
+my $default_peers = 2;
 
 sub sync_master {
- my ($id) = @_;
+ my ($id, $peers) = @_;
+
+ $peers = $default_peers unless defined $peers;
 
  {
   lock $locks_down[$id];
@@ -218,67 +201,103 @@ sub sync_slave {
  }
 }
 
-SKIP: {
- my $thr1 = spawn(sub {
-  my $here = 'first simultaneous thread';
-  sync_slave 0;
+for my $first_thread_ends_first (0, 1) {
+ for my $id (0 .. $sync_points - 1) {
+  {
+   lock $locks_down[$id];
+   $locks_down[$id] = 1;
+  }
+  {
+   lock $locks_up[$id];
+   $locks_up[$id] = 0;
+  }
+ }
 
-  is_loaded 0, "$here, beginning";
-  sync_slave 1;
+ my $thr1_end = 'finishes first';
+ my $thr2_end = 'finishes last';
 
-  do_load;
-  is_loaded 1, "$here, after loading";
-  sync_slave 2;
-  sync_slave 3;
+ ($thr1_end, $thr2_end) = ($thr2_end, $thr1_end)
+                                                unless $first_thread_ends_first;
 
-  sync_slave 4;
-  is_loaded 1, "$here, still loaded while also loaded in the other thread";
-  sync_slave 5;
+ SKIP: {
+  my $thr1 = spawn(sub {
+   my $here = "first simultaneous thread ($thr1_end)";
+   sync_slave 0;
 
-  is_loaded 1, "$here, end";
+   is_loaded 0, "$here, beginning";
+   sync_slave 1;
 
-  return;
- });
+   do_load;
+   is_loaded 1, "$here, after loading";
+   sync_slave 2;
+   sync_slave 3;
 
- skip "$could_not_create_thread (parallel 1)" => (4 * 2) unless defined $thr1;
+   sync_slave 4;
+   is_loaded 1, "$here, still loaded while also loaded in the other thread";
+   sync_slave 5;
 
- my $thr2 = spawn(sub {
-  my $here = 'second simultaneous thread';
-  sync_slave 0;
+   sync_slave 6 unless $first_thread_ends_first;
 
-  is_loaded 0, "$here, beginning";
-  sync_slave 1;
+   is_loaded 1, "$here, end";
 
-  sync_slave 2;
-  sync_slave 3;
-  is_loaded 0, "$here, loaded in other thread but not here";
+   return;
+  });
 
-  do_load;
-  is_loaded 1, "$here, after loading";
-  sync_slave 4;
-  sync_slave 5;
+  skip "$could_not_create_thread (parallel 1)" => (4 * 2) unless defined $thr1;
 
-  is_loaded 1, "$here, end";
+  my $thr2 = spawn(sub {
+   my $here = "second simultaneous thread ($thr2_end)";
+   sync_slave 0;
 
-  return;
- });
+   is_loaded 0, "$here, beginning";
+   sync_slave 1;
 
- sync_master($_) for 0 .. $#locks_down;
+   sync_slave 2;
+   sync_slave 3;
+   is_loaded 0, "$here, loaded in other thread but not here";
 
- $thr1->join;
- if (my $err = $thr1->error) {
-  die $err;
- }
+   do_load;
+   is_loaded 1, "$here, after loading";
+   sync_slave 4;
+   sync_slave 5;
 
- skip "$could_not_create_thread (parallel 2)" => (4 * 1) unless defined $thr2;
+   sync_slave 6 if $first_thread_ends_first;
 
- $thr2->join;
- if (my $err = $thr2->error) {
-  die $err;
+   is_loaded 1, "$here, end";
+
+   return;
+  });
+
+  sync_master($_) for 0 .. 5;
+
+  if (defined $thr2) {
+   ($thr2, $thr1) = ($thr1, $thr2) unless $first_thread_ends_first;
+
+   $thr1->join;
+   if (my $err = $thr1->error) {
+    die $err;
+   }
+
+   sync_master(6, 1);
+
+   $thr2->join;
+   if (my $err = $thr1->error) {
+    die $err;
+   }
+  } else {
+   sync_master(6, 1) unless $first_thread_ends_first;
+
+   $thr1->join;
+   if (my $err = $thr1->error) {
+    die $err;
+   }
+
+   skip "$could_not_create_thread (parallel 2)" => (4 * 1);
+  }
  }
-}
 
-is_loaded 0, 'main body, after simultaneous threads';
+ is_loaded 0, 'main body, after simultaneous threads';
+}
 
 do_load;
 is_loaded 1, 'main body, loaded at end';