X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2Flib%2FVPIT%2FTestHelpers.pm;h=2396cade85c2812fbf0cadcf5c3a81e1b613adde;hb=e81784934ecf6cc49325246dd3db8abd4f844a02;hp=0f37b40b6e3026eda9cb99dfb747276a4080aa71;hpb=34c317825d931337c0d5cdc6b365ca9a16906310;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/lib/VPIT/TestHelpers.pm b/t/lib/VPIT/TestHelpers.pm
index 0f37b40..2396cad 100644
--- a/t/lib/VPIT/TestHelpers.pm
+++ b/t/lib/VPIT/TestHelpers.pm
@@ -288,11 +288,19 @@ Dependencies :
 
 =item -
 
-Not VMS
+Neither VMS nor OS/2
 
 =item -
 
-L<IO::Handle>, L<IO::Select>, L<IPC::Open3>
+L<IO::Handle>
+
+=item -
+
+L<IO::Select>
+
+=item -
+
+L<IPC::Open3>
 
 =item -
 
@@ -331,7 +339,8 @@ C<CAPTURE_PERL_FAILED $details> (possibly prefixed by C<$p>)
 sub init_capture {
  my $p = sanitize_prefix(shift);
 
- skip_all 'Cannot capture output on VMS' if $^O eq 'VMS';
+ skip_all 'Cannot capture output on VMS'  if $^O eq 'VMS';
+ skip_all 'Cannot capture output on OS/2' if $^O eq 'os2';
 
  load_or_skip_all 'IO::Handle', '0', [ ];
  load_or_skip_all 'IO::Select', '0', [ ];
@@ -476,6 +485,15 @@ sub capture {
   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 {
@@ -525,7 +543,7 @@ sub capture_perl_failed_msg {
 Import :
 
     use VPIT::TestHelpers threads => [
-     $pkg, $is_threadsafe, $force_var
+     $pkg, $threadsafe_var, $force_var
     ];
 
 where :
@@ -534,11 +552,11 @@ where :
 
 =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 -
 
-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 -
 
@@ -558,15 +576,15 @@ C<perl> 5.13.4
 
 =item -
 
-L<threads> 1.67
+L<POSIX>
 
 =item -
 
-L<threads::shared> 1.14
+L<threads> 1.67
 
 =item -
 
-L<Test::Leaner>
+L<threads::shared> 1.14
 
 =back
 
@@ -587,28 +605,48 @@ C<spawn $coderef>
 =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};
 
- $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;
 
- 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', [ ];
 
- require Test::Leaner;
-
  diag "Threads testing forced by \$ENV{$force_var}" if $force;
 
  return spawn => \&spawn;