Upgrade to threads 1.73

21 files changed, 15 insertions, 101 deletions

diff --git a/ext/threads/t/basic.t b/ext/threads/t/basic.t
index 416d371db9..19ce793374 100644
--- a/ext/threads/t/basic.t
+++ b/ext/threads/t/basic.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
@@ -36,7 +32,7 @@ BEGIN {
 
 use threads;
 
-if ($threads::VERSION && ! exists($ENV{'PERL_CORE'})) {
+if ($threads::VERSION && ! $ENV{'PERL_CORE'}) {
     print(STDERR "# Testing threads $threads::VERSION\n");
 }
 
diff --git a/ext/threads/t/blocks.t b/ext/threads/t/blocks.t
index c8ea07d538..921679afae 100644
--- a/ext/threads/t/blocks.t
+++ b/ext/threads/t/blocks.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
@@ -51,7 +47,7 @@ sub ok {
     } else {
         print("not ok $id - $name\n");
         printf("# Failed test at line %d\n", (caller)[2]);
-        print(STDERR "# FAIL: $name\n") if (! exists($ENV{'PERL_CORE'}));
+        print(STDERR "# FAIL: $name\n") if (! $ENV{'PERL_CORE'});
     }
 
     return ($ok);
diff --git a/ext/threads/t/context.t b/ext/threads/t/context.t
index bddb07f8bb..c2f3b22fd5 100644
--- a/ext/threads/t/context.t
+++ b/ext/threads/t/context.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/end.t b/ext/threads/t/end.t
index 1746c2b889..b18bacac00 100644
--- a/ext/threads/t/end.t
+++ b/ext/threads/t/end.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/err.t b/ext/threads/t/err.t
index ccfad22f59..9888ee0987 100644
--- a/ext/threads/t/err.t
+++ b/ext/threads/t/err.t
@@ -2,12 +2,7 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
-    require($ENV{PERL_CORE} ? "./test.pl" : "./t/test.pl");
+    require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
 
     use Config;
     if (! $Config{'useithreads'}) {
diff --git a/ext/threads/t/exit.t b/ext/threads/t/exit.t
index 76b03d6bdc..9e9ab10db4 100644
--- a/ext/threads/t/exit.t
+++ b/ext/threads/t/exit.t
@@ -2,12 +2,7 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
-    require($ENV{PERL_CORE} ? "./test.pl" : "./t/test.pl");
+    require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
 
     use Config;
     if (! $Config{'useithreads'}) {
@@ -53,7 +48,7 @@ my $rc = $thr->join();
 ok(! defined($rc), 'Exited: threads->exit()');
 
 
-run_perl(prog => 'use threads 1.72;' .
+run_perl(prog => 'use threads 1.73;' .
                  'threads->exit(86);' .
                  'exit(99);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -103,7 +98,7 @@ $rc = $thr->join();
 ok(! defined($rc), 'Exited: $thr->set_thread_exit_only');
 
 
-run_perl(prog => 'use threads 1.72 qw(exit thread_only);' .
+run_perl(prog => 'use threads 1.73 qw(exit thread_only);' .
                  'threads->create(sub { exit(99); })->join();' .
                  'exit(86);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -113,7 +108,7 @@ run_perl(prog => 'use threads 1.72 qw(exit thread_only);' .
     is($?>>8, 86, "'use threads 'exit' => 'thread_only'");
 }
 
-my $out = run_perl(prog => 'use threads 1.72;' .
+my $out = run_perl(prog => 'use threads 1.73;' .
                            'threads->create(sub {' .
                            '    exit(99);' .
                            '});' .
@@ -129,7 +124,7 @@ my $out = run_perl(prog => 'use threads 1.72;' .
 like($out, '1 finished and unjoined', "exit(status) in thread");
 
 
-$out = run_perl(prog => 'use threads 1.72 qw(exit thread_only);' .
+$out = run_perl(prog => 'use threads 1.73 qw(exit thread_only);' .
                         'threads->create(sub {' .
                         '   threads->set_thread_exit_only(0);' .
                         '   exit(99);' .
@@ -146,7 +141,7 @@ $out = run_perl(prog => 'use threads 1.72 qw(exit thread_only);' .
 like($out, '1 finished and unjoined', "set_thread_exit_only(0)");
 
 
-run_perl(prog => 'use threads 1.72;' .
+run_perl(prog => 'use threads 1.73;' .
                  'threads->create(sub {' .
                  '   $SIG{__WARN__} = sub { exit(99); };' .
                  '   die();' .
diff --git a/ext/threads/t/free.t b/ext/threads/t/free.t
index 87fdae9c12..b6bec81219 100644
--- a/ext/threads/t/free.t
+++ b/ext/threads/t/free.t
@@ -2,11 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
     # Import test.pl into its own package
     {
         package Test;
diff --git a/ext/threads/t/free2.t b/ext/threads/t/free2.t
index c4d6981c19..2e0bbf01ab 100644
--- a/ext/threads/t/free2.t
+++ b/ext/threads/t/free2.t
@@ -2,11 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
     # Import test.pl into its own package
     {
         package Test;
diff --git a/ext/threads/t/join.t b/ext/threads/t/join.t
index af999d324b..2272e079d4 100644
--- a/ext/threads/t/join.t
+++ b/ext/threads/t/join.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/kill.t b/ext/threads/t/kill.t
index fe44294426..f09303364b 100644
--- a/ext/threads/t/kill.t
+++ b/ext/threads/t/kill.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/libc.t b/ext/threads/t/libc.t
index 795d577fda..9741cce09d 100644
--- a/ext/threads/t/libc.t
+++ b/ext/threads/t/libc.t
@@ -2,12 +2,7 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
-    require($ENV{PERL_CORE} ? "./test.pl" : "./t/test.pl");
+    require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
 
     use Config;
     if (! $Config{'useithreads'}) {
diff --git a/ext/threads/t/list.t b/ext/threads/t/list.t
index be769a9029..1ad0fadc80 100644
--- a/ext/threads/t/list.t
+++ b/ext/threads/t/list.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/problems.t b/ext/threads/t/problems.t
index d6c80c5f61..ec2bf0247a 100644
--- a/ext/threads/t/problems.t
+++ b/ext/threads/t/problems.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/stack.t b/ext/threads/t/stack.t
index 7a171f5062..cfd6cf7c6d 100644
--- a/ext/threads/t/stack.t
+++ b/ext/threads/t/stack.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/stack_env.t b/ext/threads/t/stack_env.t
index a2dac06051..e36812f361 100644
--- a/ext/threads/t/stack_env.t
+++ b/ext/threads/t/stack_env.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/state.t b/ext/threads/t/state.t
index 01371fda38..8e4f58ebce 100644
--- a/ext/threads/t/state.t
+++ b/ext/threads/t/state.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/stress_cv.t b/ext/threads/t/stress_cv.t
index b90d700d19..17380567a7 100644
--- a/ext/threads/t/stress_cv.t
+++ b/ext/threads/t/stress_cv.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/stress_re.t b/ext/threads/t/stress_re.t
index b9b9efc035..5c25dae736 100644
--- a/ext/threads/t/stress_re.t
+++ b/ext/threads/t/stress_re.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/stress_string.t b/ext/threads/t/stress_string.t
index e97c25f9b8..7edbbcb8ab 100644
--- a/ext/threads/t/stress_string.t
+++ b/ext/threads/t/stress_string.t
@@ -2,10 +2,6 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
     use Config;
     if (! $Config{'useithreads'}) {
         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
diff --git a/ext/threads/t/thread.t b/ext/threads/t/thread.t
index b3407b1c8d..531698dadb 100644
--- a/ext/threads/t/thread.t
+++ b/ext/threads/t/thread.t
@@ -2,12 +2,7 @@ use strict;
 use warnings;
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        unshift @INC, '../lib';
-    }
-
-    require($ENV{PERL_CORE} ? "./test.pl" : "./t/test.pl");
+    require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
 
     use Config;
     if (! $Config{'useithreads'}) {
@@ -166,7 +161,7 @@ package main;
 
 # bugid #24165
 
-run_perl(prog => 'use threads 1.72;' .
+run_perl(prog => 'use threads 1.73;' .
                  'sub a{threads->create(shift)} $t = a sub{};' .
                  '$t->tid; $t->join; $t->tid',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
diff --git a/ext/threads/threads.pm b/ext/threads/threads.pm
index 8d240750c2..a17dd7720b 100644
--- a/ext/threads/threads.pm
+++ b/ext/threads/threads.pm
@@ -5,7 +5,7 @@ use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '1.72_01';
+our $VERSION = '1.73';
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -134,7 +134,7 @@ threads - Perl interpreter-based threads
 
 =head1 VERSION
 
-This document describes threads version 1.72
+This document describes threads version 1.73
 
 =head1 SYNOPSIS
 
@@ -1011,7 +1011,7 @@ L<threads> Discussion Forum on CPAN:
 L<http://www.cpanforum.com/dist/threads>
 
 Annotated POD for L<threads>:
-L<http://annocpan.org/~JDHEDDEN/threads-1.72/threads.pm>
+L<http://annocpan.org/~JDHEDDEN/threads-1.73/threads.pm>
 
 Source repository:
 L<http://code.google.com/p/threads-shared/>