X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FVPIT%2FTestHelpers.pm;h=2396cade85c2812fbf0cadcf5c3a81e1b613adde;hb=6d578776b5176e59276ca1581e8ceffdfb2da760;hp=d2484c647322a536947f666e3ebccbd45f0c4503;hpb=ab33575c14a06487f6779b29ab3919291ce0c219;p=perl%2Fmodules%2FVPIT-TestHelpers.git

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index d2484c6..2396cad 100644
--- a/lib/VPIT/TestHelpers.pm
+++ b/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 {
@@ -568,10 +586,6 @@ L<threads> 1.67
 
 L<threads::shared> 1.14
 
-=item -
-
-L<Test::Leaner>
-
 =back
 
 =item *
@@ -620,15 +634,19 @@ sub init_threads {
  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;