Harden t/69-uplevel-threads.t against stray exits

[perl/modules/Scope-Upper.git] / t / 69-uplevel-threads.t

diff --git a/t/69-uplevel-threads.t b/t/69-uplevel-threads.t
index 6ea386aac9d54e13c0c554614744a2906f6693a7..775add33847963c257f367df82d5d04774ce84f5 100644 (file)
--- a/t/69-uplevel-threads.t
+++ b/t/69-uplevel-threads.t
@@ -1,48 +1,17 @@
-#!perl -T
+#!perl
 
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_SCOPE_UPPER_TEST_THREADS} ? 1 : !1;
- my $t_v   = $force ? '0' : '1.67';
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                              unless $force or "$]" >= 5.013004;
- skipall "threads $t_v required to test thread safety"
-                                              unless eval "use threads $t_v; 1";
-}
-
-use Test::More;
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'Scope::Upper' => 'Scope::Upper::SU_THREADSAFE()' ],
+ 'usleep',
+);
 
-use Scope::Upper qw<uplevel UP SU_THREADSAFE>;
+use Test::Leaner;
 
-my $num;
-
-BEGIN {
- skipall 'This Scope::Upper isn\'t thread safe' unless SU_THREADSAFE;
- plan tests => 3 + ($num = 30) * 3;
- defined and diag "Using threads $_" for $threads::VERSION;
- if (eval "use Time::HiRes; 1") {
-  defined and diag "Using Time::HiRes $_" for $Time::HiRes::VERSION;
-  *usleep = \&Time::HiRes::usleep;
- } else {
-  diag 'Using fallback usleep';
-  *usleep = sub {
-   my $s = int($_[0] / 2.5e5);
-   sleep $s if $s;
-  };
- }
-}
+use Scope::Upper qw<uplevel UP>;
 
 sub depth {
  my $depth = 0;
@@ -73,7 +42,7 @@ sub up1 {
  local $z = $tid;
  my $p    = "[$tid] up1";
 
- usleep rand(1e6);
+ usleep rand(2.5e5);
 
  my @res = (
   -2,
@@ -95,4 +64,8 @@ sub up1 {
  is_deeply \@res, [ -2, -1, $tid .. $tid + 2, 1, 2 ], "$p: returns correctly";
 }
 
-$_->join for map threads->create(\&up1), 1 .. $num;
+my @threads = map spawn(\&up1), 1 .. 30;
+
+$_->join for @threads;
+
+done_testing;