}
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')->(@_) }
=item *
-Dependencies : none
+Dependencies :
+
+=over 8
+
+=item -
+
+L<File::Spec>
+
+=back
=item *
=item -
+C<run_perl_file $file>
+
+=item -
+
C<RUN_PERL_FAILED> (possibly prefixed by C<$p>)
=back
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' },
);
}
};
}
+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
=item -
-Not VMS
+Neither VMS nor OS/2
=item -
-L<IO::Handle>, L<IO::Select>, L<IPC::Open3>
+L<IO::Handle>
+
+=item -
+
+L<IO::Select>
+
+=item -
+
+L<IPC::Open3>
=item -
sub init_capture {
my $p = sanitize_prefix(shift);
- skip_all 'Cannot capture output on VMS' if $^O eq 'VMS';
+ skip_all 'Cannot capture output on VMS' if $^O eq 'VMS';
+ skip_all 'Cannot capture output on OS/2' if $^O eq 'os2';
load_or_skip_all 'IO::Handle', '0', [ ];
load_or_skip_all 'IO::Select', '0', [ ];
1;
};
+ if ("$]" < 5.014 and $ok and ($status >> 8) == 255 and defined $content_err
+ and $content_err =~ /^open3/) {
+ # Before perl commit 8960aa87 (between 5.12 and 5.14), exceptions in open3
+ # could be reported to STDERR instead of being propagated, so work around
+ # this.
+ $ok = 0;
+ $@ = $content_err;
+ }
+
if ($ok) {
return ($status, $content_out, $content_err);
} else {
Import :
use VPIT::TestHelpers threads => [
- $pkg, $is_threadsafe, $force_var
+ $pkg, $threadsafe_var, $force_var
];
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 -
=item -
-L<threads> 1.67
+L<POSIX>
=item -
-L<threads::shared> 1.14
+L<threads> 1.67
=item -
-L<Test::Leaner>
+L<threads::shared> 1.14
=back
=back
+=item *
+
+Notes :
+
+=over 8
+
+=item -
+
+C<< exit => 'threads_only' >> is passed to C<< threads->import >>.
+
+=back
+
=back
=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;
+ # 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 $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;
skip_all 'perl 5.13.4 required to test thread safety'
unless $force or "$]" >= 5.013_004;
- if (($INC{'Test/More.pm'} || $INC{'Test/Leaner.pm'}) && !$INC{'threads.pm'}) {
- die 'Test::More/Test::Leaner was loaded too soon';
+ unless ($INC{'threads.pm'}) {
+ my $test_module;
+ if ($INC{'Test/Leaner.pm'}) {
+ $test_module = 'Test::Leaner';
+ } elsif ($INC{'Test/More.pm'}) {
+ $test_module = 'Test::More';
+ }
+ 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', [ ];
- require Test::Leaner;
-
diag "Threads testing forced by \$ENV{$force_var}" if $force;
return spawn => \&spawn;
Import :
- use VPIT::TestHelpers 'usleep'
+ use VPIT::TestHelpers 'usleep' => [ @impls ];
+
+where :
+
+=over 8
+
+=item -
+
+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
=item *
=cut
sub init_usleep {
- my $usleep;
+ my (@impls) = @_;
- if (do { local $@; eval { require Time::HiRes; 1 } }) {
- defined and diag "Using usleep() from Time::HiRes $_"
+ my %impls = (
+ 'Time::HiRes' => sub {
+ if (do { local $@; eval { require Time::HiRes; 1 } }) {
+ defined and diag "Using usleep() from Time::HiRes $_"
for $Time::HiRes::VERSION;
- $usleep = \&Time::HiRes::usleep;
- } else {
- diag 'Using fallback usleep()';
- $usleep = sub {
- my $s = int($_[0] / 1e6);
- sleep $s if $s;
- };
+ return \&Time::HiRes::usleep;
+ } else {
+ 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 $ms = int $_[0];
+ my $s = int($ms / 1e6) + ($ms % 1e6 == 0 ? 0 : 1);
+ my $t = sleep $s;
+ return $t * 1e6;
+ };
+ },
+ );
+
+ @impls = qw<Time::HiRes select sleep> unless @impls;
+
+ my $usleep;
+ for my $impl (@impls) {
+ next unless defined $impl and $impls{$impl};
+ $usleep = $impls{$impl}->();
+ last if defined $usleep;
}
+ skip_all "Could not find a suitable usleep() implementation among: @impls"
+ unless $usleep;
+
return usleep => $usleep;
}