Add threads feature

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index 68f11f0092e8b89cee24aa1e8bcb1473d39c79b9..c57826a1cab46cb246931b36af0a5e67d0bda138 100644 (file)
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -24,7 +24,8 @@ my %default_exports = (
 );
 
 my %features = (
- usleep => \&init_usleep,
+ threads => \&init_threads,
+ usleep  => \&init_usleep,
 );
 
 sub import {
@@ -155,6 +156,30 @@ sub run_perl {
  system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
 }
 
+sub init_threads {
+ my ($pkg, $threadsafe, $force_var) = @_;
+
+ $pkg = 'package' unless defined $pkg;
+ skip_all "This $pkg isn't thread safe" if defined $threadsafe and !$threadsafe;
+
+ skip_all 'This perl wasn\'t built to support threads'
+                                            unless $Config::Config{useithreads};
+
+ $force_var = 'PERL_FORCE_TEST_THREADS' unless defined $force_var;
+ my $force  = $ENV{$force_var} ? 1 : !1;
+ skip_all 'perl 5.13.4 required to test thread safety'
+                                             unless $force or "$]" >= 5.013_004;
+
+ load_or_skip_all 'threads',         $force ? '0' : '1.67', [ ];
+ load_or_skip_all 'threads::shared', $force ? '0' : '1.14', [ ];
+
+ require Test::Leaner;
+
+ diag "Threads testing forced by \$ENV{$force_var}" if $force;
+
+ return spawn => \&spawn;
+}
+
 sub init_usleep {
  my $usleep;
 
@@ -173,6 +198,18 @@ sub init_usleep {
  return usleep => $usleep;
 }
 
+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 $@;
+ diag @diag;
+ return $thread ? $thread : ();
+}
+
 package VPIT::TestHelpers::Guard;
 
 sub new {

diff --git a/t/40-threads.t b/t/40-threads.t
new file mode 100644 (file)
index 0000000..5d34f29
--- /dev/null
+++ b/t/40-threads.t
@@ -0,0 +1,15 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{PERL_FORCE_TEST_THREADS} = '' }
+
+use VPIT::TestHelpers threads => [ 'Is::Thread::Safe', undef ];
+
+use Test::More tests => 2;
+
+$_->join for map {
+ my $id = $_;
+ spawn sub { pass "in thread $id" };
+} 1 .. 2;

diff --git a/t/41-threads-unsafe.t b/t/41-threads-unsafe.t
new file mode 100644 (file)
index 0000000..79c14ff
--- /dev/null
+++ b/t/41-threads-unsafe.t
@@ -0,0 +1,15 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{PERL_FORCE_TEST_THREADS} = '' }
+
+use VPIT::TestHelpers threads => [ 'Not::Thread::Safe', 0 ];
+
+use Test::More tests => 1;
+
+fail 'unsafe module was not detected';
+
+my $thread = spawn sub { };
+$thread->join;

diff --git a/t/42-threads-forced.t b/t/42-threads-forced.t
new file mode 100644 (file)
index 0000000..a3e9ec8
--- /dev/null
+++ b/t/42-threads-forced.t
@@ -0,0 +1,15 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{PERL_FORCE_TEST_THREADS} = 1 }
+
+use VPIT::TestHelpers threads => [ 'Is::Thread::Safe', undef ];
+
+use Test::More tests => 2;
+
+$_->join for map {
+ my $id = $_;
+ spawn sub { pass "in thread $id" };
+} 1 .. 2;

diff --git a/t/43-threads-unsafe-forced.t b/t/43-threads-unsafe-forced.t
new file mode 100644 (file)
index 0000000..ae05c60
--- /dev/null
+++ b/t/43-threads-unsafe-forced.t
@@ -0,0 +1,15 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+BEGIN { $ENV{PERL_FORCE_TEST_THREADS} = 1 }
+
+use VPIT::TestHelpers threads => [ 'Not::Thread::Safe', 0 ];
+
+use Test::More tests => 1;
+
+fail 'force should not overrule thread-unsafe';
+
+my $thread = spawn sub { };
+$thread->join;