From: Vincent Pit Date: Sat, 4 Nov 2017 14:57:21 +0000 (+0100) Subject: Update VPIT::TestHelpers to 15e8aee3 X-Git-Tag: rt123411 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=9dac5e8b5fc2c28774d728035869e415d8e33ff9;p=perl%2Fmodules%2Fautovivification.git Update VPIT::TestHelpers to 15e8aee3 --- diff --git a/t/lib/VPIT/TestHelpers.pm b/t/lib/VPIT/TestHelpers.pm index 75ca216..f47bee1 100644 --- a/t/lib/VPIT/TestHelpers.pm +++ b/t/lib/VPIT/TestHelpers.pm @@ -97,7 +97,9 @@ my $test_sub = 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')->(@_) } @@ -193,7 +195,15 @@ C<$p> is prefixed to the constants exported by this feature (defaults to C<''>). =item * -Dependencies : none +Dependencies : + +=over 8 + +=item - + +L + +=back =item * @@ -207,6 +217,10 @@ C =item - +C + +=item - + C (possibly prefixed by C<$p>) =back @@ -241,8 +255,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 +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 =over 4 @@ -624,6 +658,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;