Update VPIT::TestHelpers to 15e8aee3

diff --git a/t/lib/VPIT/TestHelpers.pm b/t/lib/VPIT/TestHelpers.pm
index b7b7635dafc634647b02a13f9492925d0f7ceae4..f47bee1e5e1f7b222f56a6520eb50e59162593c1 100644 (file)
--- a/t/lib/VPIT/TestHelpers.pm
+++ b/t/lib/VPIT/TestHelpers.pm
@@ -97,7 +97,9 @@ my $test_sub = sub {
  }
 
  my $glob = $stash->{$sub};
  }
 
  my $glob = $stash->{$sub};

- return $glob ? *$glob{CODE} : undef;
+ return ref \$glob eq 'GLOB' ? *$glob{CODE}
+      : ref  $glob eq 'CODE' ?  $glob
+      :                          undef;

 };
 
 sub skip { $test_sub->('skip')->(@_) }
 };
 
 sub skip { $test_sub->('skip')->(@_) }


@@ -193,7 +195,15 @@ C<$p> is prefixed to the constants exported by this feature (defaults to C<''>).
 
 =item *
 
 
 =item *
 

-Dependencies : none
+Dependencies :
+
+=over 8
+
+=item -
+
+L<File::Spec>
+
+=back

 
 =item *
 
 
 =item *
 


@@ -207,6 +217,10 @@ C<run_perl $code>
 
 =item -
 
 
 =item -
 

+C<run_perl_file $file>
+
+=item -
+

 C<RUN_PERL_FAILED> (possibly prefixed by C<$p>)
 
 =back
 C<RUN_PERL_FAILED> (possibly prefixed by C<$p>)
 
 =back


@@ -241,8 +255,14 @@ sub fresh_perl_env (&) {
 sub init_run_perl {
  my $p = sanitize_prefix(shift);
 
 sub init_run_perl {
  my $p = sanitize_prefix(shift);
 

+ # This is only required for run_perl_file(), so it is not needed for the
+ # threads feature which only calls run_perl() - don't forget to update its
+ # requirements if this ever changes.
+ require File::Spec;
+

  return (
   run_perl              => \&run_perl,
  return (
   run_perl              => \&run_perl,

+  run_perl_file         => \&run_perl_file,

   "${p}RUN_PERL_FAILED" => sub () { 'Could not execute perl subprocess' },
  );
 }
   "${p}RUN_PERL_FAILED" => sub () { 'Could not execute perl subprocess' },
  );
 }


@@ -260,6 +280,20 @@ sub run_perl {
  };
 }
 
  };
 }
 

+sub run_perl_file {
+ my $file = shift;
+
+ $file = File::Spec->rel2abs($file);
+ unless (-e $file and -r _) {
+  die 'Could not run perl file';
+ }
+
+ fresh_perl_env {
+  my ($perl, @perl_args) = @_;
+  system { $perl } $perl, @perl_args, $file;
+ };
+}
+

 =head2 C<capture>
 
 =over 4
 =head2 C<capture>
 
 =over 4


@@ -600,6 +634,18 @@ C<spawn $coderef>
 
 =back
 
 
 =back
 

+=item *
+
+Notes :
+
+=over 8
+
+=item -
+
+C<< exit => 'threads_only' >> is passed to C<< threads->import >>.
+
+=back
+

 =back
 
 =cut
 =back
 
 =cut


@@ -612,6 +658,7 @@ sub init_threads {
 
  if (defined $pkg and defined $threadsafe_var) {
   my $threadsafe;
 
  if (defined $pkg and defined $threadsafe_var) {
   my $threadsafe;

+  # run_perl() doesn't actually require anything

   my $stat = run_perl("require POSIX; require $pkg; exit($threadsafe_var ? POSIX::EXIT_SUCCESS() : POSIX::EXIT_FAILURE())");
   if (defined $stat) {
    require POSIX;
   my $stat = run_perl("require POSIX; require $pkg; exit($threadsafe_var ? POSIX::EXIT_SUCCESS() : POSIX::EXIT_FAILURE())");
   if (defined $stat) {
    require POSIX;


@@ -644,7 +691,9 @@ sub init_threads {
   die "$test_module was loaded too soon" if defined $test_module;
  }
 
   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',         $force ? '0' : '1.67', [
+  exit => 'threads_only',
+ ];

  load_or_skip_all 'threads::shared', $force ? '0' : '1.14', [ ];
 
  diag "Threads testing forced by \$ENV{$force_var}" if $force;
  load_or_skip_all 'threads::shared', $force ? '0' : '1.14', [ ];
 
  diag "Threads testing forced by \$ENV{$force_var}" if $force;


@@ -680,7 +729,7 @@ where :
 
 =item -
 
 
 =item -
 

-C<@impls> is the list of desired implementations (which may be C<'Time::HiRes'> or C<'sleep'>), in the order they should be checked.
+C<@impls> is the list of desired implementations (which may be C<'Time::HiRes'>, C<'select'> or C<'sleep'>), in the order they should be checked.

 When the list is empty, it defaults to all of them.
 
 =back
 When the list is empty, it defaults to all of them.
 
 =back