Implement run_perl_file()

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index 75ca21603ff4c794b51e3752f9ebf6f497c4c323..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
@@ -624,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;

diff --git a/t/30-run_perl.t b/t/30-run_perl.t
index bfc7bbb7fa477dab0bba34dc76a3b788e2d02c7c..21837bed3fe8cde3b441645fcc3a2ae1f05ce036 100644 (file)
--- a/t/30-run_perl.t
+++ b/t/30-run_perl.t
@@ -5,7 +5,7 @@ use warnings;
 
 use VPIT::TestHelpers 'run_perl' => [ 'VTH' ];
 
-use Test::More tests => 5 + 2;
+use Test::More tests => 5 + 2 + 2;
 
 use Config;
 use File::Temp;
@@ -71,6 +71,16 @@ for my $os (qw<MSWin32 android darwin cygwin linux>) {
  is $got, $exp, "run_perl preserving $os ENV vars";
 }
 
+{
+ local $@;
+ my $stat = eval {
+  run_perl_file 't/testcases/run_perl_file.pl';
+ };
+ $stat = $stat >> 8 if defined $stat;
+ is $@,    '',  'run_perl_file() does not croak';
+ is $stat, 123, 'run_perl_file() captures the exit value';
+}
+
 {
  local $@;
  eval {

diff --git a/t/testcases/run_perl_file.pl b/t/testcases/run_perl_file.pl
new file mode 100644 (file)
index 0000000..8b5f746
--- /dev/null
+++ b/t/testcases/run_perl_file.pl
@@ -0,0 +1 @@
+exit 123;