Update VPIT::TestHelpers to 3edc6d15

POSIX is now correctly required.

diff --git a/Makefile.PL b/Makefile.PL
index aa39d2229314413157745eac87a7d79cb93aaa09..a4a665b8c569fef5af51d2c17607370229f0952f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -83,6 +83,7 @@ my %BUILD_REQUIRES = (
  'Carp'                => 0,
  'Config'              => 0,
  'ExtUtils::MakeMaker' => 0,
  'Carp'                => 0,
  'Config'              => 0,
  'ExtUtils::MakeMaker' => 0,

+ 'POSIX'               => 0,

  'Test::More'          => 0,
  'lib'                 => 0,
  %PREREQ_PM,
  'Test::More'          => 0,
  'lib'                 => 0,
  %PREREQ_PM,

diff --git a/t/09-load-threads.t b/t/09-load-threads.t
index 91092b0889df9b4804c11cb96772d21609ca976d..0825b27b1e13e7468e0599f78e39b3e379b53281 100644 (file)
--- a/t/09-load-threads.t
+++ b/t/09-load-threads.t
@@ -3,9 +3,6 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use lib 't/lib';
-use VPIT::TestHelpers 'run_perl';
-

 my ($module, $thread_safe_var);
 BEGIN {
  $module          = 'Variable::Magic';
 my ($module, $thread_safe_var);
 BEGIN {
  $module          = 'Variable::Magic';


@@ -27,29 +24,8 @@ sub load_test {
 
 # Keep the rest of the file untouched
 
 
 # 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';
 
 
 my $could_not_create_thread = 'Could not create thread';
 

diff --git a/t/40-threads.t b/t/40-threads.t
index 7f55f22fc43cea8ee85dcf3301ae06a3b6a14290..6e77c2fd24b27d5285c59265ec1b0f1b4daaa20d 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -1,4 +1,4 @@
-#!perl -T
+#!perl

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;


@@ -10,7 +10,7 @@ use Variable::Magic qw<
 
 use lib 't/lib';
 use VPIT::TestHelpers (
 
 use lib 't/lib';
 use VPIT::TestHelpers (

- threads => [ 'Variable::Magic' => Variable::Magic::VMG_THREADSAFE ],
+ threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ],

 );
 
 use Test::Leaner 'no_plan';
 );
 
 use Test::Leaner 'no_plan';

diff --git a/t/41-clone.t b/t/41-clone.t
index 7528bec44228c29c1a24c452b37b88f6307824d2..1efd250bd13f6c8a0b59c6401256f70804bda238 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -1,4 +1,4 @@
-#!perl -T
+#!perl

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;


@@ -10,7 +10,7 @@ use Variable::Magic qw<
 
 use lib 't/lib';
 use VPIT::TestHelpers (
 
 use lib 't/lib';
 use VPIT::TestHelpers (

- threads => [ 'Variable::Magic' => Variable::Magic::VMG_THREADSAFE ],
+ threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ],

 );
 
 use Test::Leaner 'no_plan';
 );
 
 use Test::Leaner 'no_plan';

diff --git a/t/lib/VPIT/TestHelpers.pm b/t/lib/VPIT/TestHelpers.pm
index 0f37b40b6e3026eda9cb99dfb747276a4080aa71..e8cfa710ea73aec55801f5f9fcdd03548cb8a3e8 100644 (file)
--- a/t/lib/VPIT/TestHelpers.pm
+++ b/t/lib/VPIT/TestHelpers.pm
@@ -476,6 +476,15 @@ sub capture {
   1;
  };
 
   1;
  };
 

+ if ("$]" < 5.014 and $ok and ($status >> 8) == 255 and defined $content_err
+                  and $content_err =~ /^open3/) {
+  # Before perl commit 8960aa87 (between 5.12 and 5.14), exceptions in open3
+  # could be reported to STDERR instead of being propagated, so work around
+  # this.
+  $ok = 0;
+  $@  = $content_err;
+ }
+

  if ($ok) {
   return ($status, $content_out, $content_err);
  } else {
  if ($ok) {
   return ($status, $content_out, $content_err);
  } else {


@@ -525,7 +534,7 @@ sub capture_perl_failed_msg {
 Import :
 
     use VPIT::TestHelpers threads => [
 Import :
 
     use VPIT::TestHelpers threads => [

-     $pkg, $is_threadsafe, $force_var
+     $pkg, $threadsafe_var, $force_var

     ];
 
 where :
     ];
 
 where :


@@ -534,11 +543,11 @@ where :
 
 =item -
 
 
 =item -
 

-C<$pkg> is the target package name to be used in error messages (defaults to C<'package'>) ;
+C<$pkg> is the target package name that will be exercised by this test ;

 
 =item -
 
 
 =item -
 

-C<$is_threadsafe> is a boolean telling whether the target module is thread-safe (not tested if C<undef>) ;
+C<$threadsafe_var> is the name of an optional variable in C<$pkg> that evaluates to true if and only if the module claims to be thread safe (not checked if either C<$threadsafe_var> or C<$pkg> is C<undef>) ;

 
 =item -
 
 
 =item -
 


@@ -558,15 +567,15 @@ C<perl> 5.13.4
 
 =item -
 
 
 =item -
 

-L<threads> 1.67
+L<POSIX>

 
 =item -
 
 
 =item -
 

-L<threads::shared> 1.14
+L<threads> 1.67

 
 =item -
 
 
 =item -
 

-L<Test::Leaner>
+L<threads::shared> 1.14

 
 =back
 
 
 =back
 


@@ -587,28 +596,48 @@ C<spawn $coderef>
 =cut
 
 sub init_threads {
 =cut
 
 sub init_threads {

- my ($pkg, $threadsafe, $force_var) = @_;
+ my ($pkg, $threadsafe_var, $force_var) = @_;

 
  skip_all 'This perl wasn\'t built to support threads'
                                             unless $Config::Config{useithreads};
 
 
  skip_all 'This perl wasn\'t built to support threads'
                                             unless $Config::Config{useithreads};
 

- $pkg = 'package' unless defined $pkg;
- skip_all "This $pkg isn't thread safe" if defined $threadsafe and !$threadsafe;
+ if (defined $pkg and defined $threadsafe_var) {
+  my $threadsafe;
+  my $stat = run_perl("require POSIX; require $pkg; exit($threadsafe_var ? POSIX::EXIT_SUCCESS() : POSIX::EXIT_FAILURE())");
+  if (defined $stat) {
+   require POSIX;
+   my $res  = $stat >> 8;
+   if ($res == POSIX::EXIT_SUCCESS()) {
+    $threadsafe = 1;
+   } elsif ($res == POSIX::EXIT_FAILURE()) {
+    $threadsafe = !1;
+   }
+  }
+  if (not defined $threadsafe) {
+   skip_all "Could not detect if $pkg is thread safe or not";
+  } elsif (not $threadsafe) {
+   skip_all "This $pkg is not thread safe";
+  }
+ }

 
  $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;
 
 
  $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;
 

- if (($INC{'Test/More.pm'} || $INC{'Test/Leaner.pm'}) && !$INC{'threads.pm'}) {
-  die 'Test::More/Test::Leaner was loaded too soon';
+ unless ($INC{'threads.pm'}) {
+  my $test_module;
+  if ($INC{'Test/Leaner.pm'}) {
+   $test_module = 'Test::Leaner';
+  } elsif ($INC{'Test/More.pm'}) {
+   $test_module = 'Test::More';
+  }
+  die "$test_module was loaded too soon" if defined $test_module;

  }
 
  load_or_skip_all 'threads',         $force ? '0' : '1.67', [ ];
  load_or_skip_all 'threads::shared', $force ? '0' : '1.14', [ ];
 
  }
 
  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;
  diag "Threads testing forced by \$ENV{$force_var}" if $force;
 
  return spawn => \&spawn;