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

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index 3225a1c..d2484c6 100644
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -268,7 +268,17 @@ sub run_perl {
 
 Import :
 
-    use VPIT::TestHelpers 'capture'
+    use VPIT::TestHelpers capture => [ $p ];
+
+where :
+
+=over 8
+
+=item -
+
+C<$p> is prefixed to the constants exported by this feature (defaults to C<''>).
+
+=back
 
 =item *
 
@@ -302,8 +312,16 @@ C<capture @command>
 
 =item -
 
+C<CAPTURE_FAILED $details> (possibly prefixed by C<$p>)
+
+=item -
+
 C<capture_perl $code>
 
+=item -
+
+C<CAPTURE_PERL_FAILED $details> (possibly prefixed by C<$p>)
+
 =back
 
 =back
@@ -311,6 +329,8 @@ C<capture_perl $code>
 =cut
 
 sub init_capture {
+ my $p = sanitize_prefix(shift);
+
  skip_all 'Cannot capture output on VMS' if $^O eq 'VMS';
 
  load_or_skip_all 'IO::Handle', '0', [ ];
@@ -321,8 +341,10 @@ sub init_capture {
  }
 
  return (
-  capture      => \&capture,
-  capture_perl => \&capture_perl,
+  capture                   => \&capture,
+  "${p}CAPTURE_FAILED"      => \&capture_failed_msg,
+  capture_perl              => \&capture_perl,
+  "${p}CAPTURE_PERL_FAILED" => \&capture_perl_failed_msg,
  );
 }
 
@@ -463,6 +485,15 @@ sub capture {
  }
 }
 
+sub capture_failed_msg {
+ my $details = shift;
+
+ my $msg = 'Could not capture command output';
+ $msg   .= " ($details)" if defined $details;
+
+ return $msg;
+}
+
 sub capture_perl {
  my $code = shift;
 
@@ -476,6 +507,15 @@ sub capture_perl {
  };
 }
 
+sub capture_perl_failed_msg {
+ my $details = shift;
+
+ my $msg = 'Could not capture perl output';
+ $msg   .= " ($details)" if defined $details;
+
+ return $msg;
+}
+
 =head2 C<threads>
 
 =over 4
@@ -485,7 +525,7 @@ sub capture_perl {
 Import :
 
     use VPIT::TestHelpers threads => [
-     $pkg, $is_threadsafe, $force_var
+     $pkg, $threadsafe_var, $force_var
     ];
 
 where :
@@ -494,11 +534,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 -
 
@@ -518,6 +558,10 @@ C<perl> 5.13.4
 
 =item -
 
+L<POSIX>
+
+=item -
+
 L<threads> 1.67
 
 =item -
@@ -547,13 +591,29 @@ 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;