From: Vincent Pit <vince@profvince.com>
Date: Fri, 2 Nov 2012 12:35:46 +0000 (-0200)
Subject: Threads tests may not be able to spawn all the threads
X-Git-Tag: v0.13~30
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLexical-Types.git;a=commitdiff_plain;h=a838a3bf0d49fcb56ea57da58771d2e2c77bfc26

Threads tests may not be able to spawn all the threads

To work around this :
- move all the threads boilerplate to a new helper test module ;
- capture the warnings/errors that threads->create may throw and reprint
them properly as diagnostics ;
- do not hardcode the plan and use 'no_plan' instead.
---

diff --git a/MANIFEST b/MANIFEST
index fe71fe9..4507c76 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -35,4 +35,5 @@ t/lib/Lexical/Types/TestRequired1.pm
 t/lib/Lexical/Types/TestRequired2.pm
 t/lib/Lexical/Types/TestRequired3X.pm
 t/lib/Lexical/Types/TestRequired3Y.pm
+t/lib/Lexical/Types/TestThreads.pm
 t/lib/VPIT/TestHelpers.pm
diff --git a/t/30-threads.t b/t/30-threads.t
index c616b76..73359c3 100644
--- a/t/30-threads.t
+++ b/t/30-threads.t
@@ -3,33 +3,13 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_LEXICAL_TYPES_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                              unless $force or "$]" >= 5.013004;
-}
+use lib 't/lib';
+use Lexical::Types::TestThreads;
 
-use threads;
+use Test::More 'no_plan';
 
-use Test::More;
-
-BEGIN {
- require Lexical::Types;
- skipall 'This Lexical::Types isn\'t thread safe'
-                                         unless Lexical::Types::LT_THREADSAFE();
- plan tests => 10 * 2 * 3 * (1 + 2);
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+my $threads = 10;
+my $runs    = 2;
 
 {
  package Lexical::Types::Test::Tag;
@@ -53,7 +33,7 @@ use Lexical::Types as => 'Lexical::Types::Test::';
 sub try {
  my $tid = threads->tid();
 
- for (1 .. 2) {
+ for (1 .. $runs) {
   my Tag $t;
   is $t, $tid, "typed lexical correctly initialized at run $_ in thread $tid";
 
@@ -76,5 +56,8 @@ EVALD
  }
 }
 
-my @t = map threads->create(\&try), 1 .. 10;
+my @t = map spawn(\&try), 1 .. $threads;
+
 $_->join for @t;
+
+pass 'done';
diff --git a/t/31-threads-teardown.t b/t/31-threads-teardown.t
index 34e61ac..c15ebec 100644
--- a/t/31-threads-teardown.t
+++ b/t/31-threads-teardown.t
@@ -3,33 +3,10 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_LEXICAL_TYPES_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                              unless $force or "$]" >= 5.013004;
-}
+use lib 't/lib';
+use Lexical::Types::TestThreads;
 
-use threads;
-
-use Test::More;
-
-BEGIN {
- require Lexical::Types;
- skipall 'This Lexical::Types isn\'t thread safe'
-                                         unless Lexical::Types::LT_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::More tests => 1;
 
 sub run_perl {
  my $code = shift;
diff --git a/t/lib/Lexical/Types/TestThreads.pm b/t/lib/Lexical/Types/TestThreads.pm
new file mode 100644
index 0000000..83242bc
--- /dev/null
+++ b/t/lib/Lexical/Types/TestThreads.pm
@@ -0,0 +1,53 @@
+package Lexical::Types::TestThreads;
+
+use strict;
+use warnings;
+
+use Config qw<%Config>;
+
+use VPIT::TestHelpers;
+
+sub import {
+ shift;
+
+ require Lexical::Types;
+
+ skip_all 'This Lexical::Types isn\'t thread safe'
+                                         unless Lexical::Types::LT_THREADSAFE();
+
+ my $force = $ENV{PERL_LEXICAL_TYPES_TEST_THREADS} ? 1 : !1;
+ skip_all 'This perl wasn\'t built to support threads'
+                                                    unless $Config{useithreads};
+ skip_all 'perl 5.13.4 required to test thread safety'
+                                              unless $force or "$]" >= 5.013004;
+
+ load_or_skip('threads', $force ? '0' : '1.67', [ ],
+              'required to test thread safety');
+
+ my %exports = (
+  spawn => \&spawn,
+ );
+
+ my $pkg = caller;
+ while (my ($name, $code) = each %exports) {
+  no strict 'refs';
+  *{$pkg.'::'.$name} = $code;
+ }
+}
+
+sub spawn {
+ local $@;
+ my @diag;
+ my $thread = eval {
+  local $SIG{__WARN__} = sub { push @diag, "Thread creation warning: @_" };
+  threads->create(@_);
+ };
+ push @diag, "Thread creation error: $@" if $@;
+ if (@diag) {
+  require Test::Leaner;
+  Test::Leaner::diag($_) for @diag;
+ }
+ return $thread ? $thread : ();
+}
+
+1;