Implement run_perl_file()

[perl/modules/VPIT-TestHelpers.git] / lib / VPIT / TestHelpers.pm

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index 65fc2569ba1c2a70776d4cd99d11bb3327bd1f13..10550eec28c139e43612a455205230900984c994 100644 (file)
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -193,7 +193,15 @@ C<$p> is prefixed to the constants exported by this feature (defaults to C<''>).
 
 =item *
 
-Dependencies : none
+Dependencies :
+
+=over 8
+
+=item -
+
+L<File::Spec>
+
+=back
 
 =item *
 
@@ -207,6 +215,10 @@ C<run_perl $code>
 
 =item -
 
+C<run_perl_file $file>
+
+=item -
+
 C<RUN_PERL_FAILED> (possibly prefixed by C<$p>)
 
 =back
@@ -241,8 +253,14 @@ sub fresh_perl_env (&) {
 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,
+  run_perl_file         => \&run_perl_file,
   "${p}RUN_PERL_FAILED" => sub () { 'Could not execute perl subprocess' },
  );
 }
@@ -260,6 +278,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
@@ -600,6 +632,18 @@ C<spawn $coderef>
 
 =back
 
+=item *
+
+Notes :
+
+=over 8
+
+=item -
+
+C<< exit => 'threads_only' >> is passed to C<< threads->import >>.
+
+=back
+
 =back
 
 =cut
@@ -612,6 +656,7 @@ sub init_threads {
 
  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;
@@ -644,7 +689,9 @@ sub init_threads {
   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;
@@ -680,7 +727,7 @@ where :
 
 =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
@@ -718,17 +765,37 @@ sub init_usleep {
     return undef;
    }
   },
+  'select' => sub {
+   if ($Config::Config{d_select}) {
+    diag 'Using select()-based fallback usleep()';
+    return sub ($) {
+     my $s = $_[0];
+     my $r = 0;
+     while ($s > 0) {
+      my ($found, $t) = select(undef, undef, undef, $s / 1e6);
+      last unless defined $t;
+      $t  = int($t * 1e6);
+      $s -= $t;
+      $r += $t;
+     }
+     return $r;
+    };
+   } else {
+    return undef;
+   }
+  },
   'sleep' => sub {
    diag 'Using sleep()-based fallback usleep()';
-   return sub {
-    my $s = int($_[0] / 1e6);
-    my $t = sleep $s;
+   return sub ($) {
+    my $ms = int $_[0];
+    my $s  = int($ms / 1e6) + ($ms % 1e6 == 0 ? 0 : 1);
+    my $t  = sleep $s;
     return $t * 1e6;
    };
   },
  );
 
- @impls = qw<Time::HiRes sleep> unless @impls;
+ @impls = qw<Time::HiRes select sleep> unless @impls;
 
  my $usleep;
  for my $impl (@impls) {