Threads tests may not be able to spawn all the threads

[perl/modules/Lexical-Types.git] / t / 31-threads-teardown.t

diff --git a/t/31-threads-teardown.t b/t/31-threads-teardown.t
index 306618252cac81e87af46c854624455308a682fc..c15ebec106664732e45bbbd9836b68da01936e87 100644 (file)
--- a/t/31-threads-teardown.t
+++ b/t/31-threads-teardown.t
@@ -3,33 +3,10 @@
 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_LEXICAL_TYPES_TEST_THREADS} ? 1 : !1;
- 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;
-}
+use lib 't/lib';
+use Lexical::Types::TestThreads;
 
-use threads;
-
-use Test::More;
-
-BEGIN {
- require Lexical::Types;
- skipall 'This Lexical::Types isn\'t thread safe'
-                                         unless Lexical::Types::LT_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::More tests => 1;
 
 sub run_perl {
  my $code = shift;
@@ -43,7 +20,7 @@ sub run_perl {
 
 SKIP:
 {
- skip 'Fails on 5.8.2 and lower' => 1 if $] <= 5.008002;
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002;
 
  my $status = run_perl <<' RUN';
   { package IntX; package IntY; package IntZ; }
@@ -55,11 +32,11 @@ SKIP:
   }
   use threads;
   $code = threads->create(sub {
-   $code = @expected = qw/IntX/;
+   $code = @expected = qw<IntX>;
    eval q{use Lexical::Types as => \&cb; my IntX $x;}; die if $@;
    return $code;
   })->join;
-  $code += @expected = qw/IntZ/;
+  $code += @expected = qw<IntZ>;
   eval q{my IntY $y;}; die if $@;
   eval q{use Lexical::Types as => \&cb; my IntZ $z;}; die if $@;
   $code += 256 if $code < 0;