From 821f5ffa2f9d60b548dcc3fae13ebf47b1875d04 Mon Sep 17 00:00:00 2001
From: "Jerry D. Hedden" <jdhedden@cpan.org>
Date: Tue, 18 Sep 2007 12:48:03 -0400
Subject: [PATCH] threads 1.67 From: "Jerry D. Hedden" <jdhedden@cpan.org>
 Message-ID: <1ff86f510709181348h45b1941epf501f9f73d4daa75@mail.gmail.com>

fix test count.

p4raw-id: //depot/perl@31897
---
 ext/threads/t/exit.t   | 10 +++++-----
 ext/threads/t/thread.t | 13 ++++---------
 ext/threads/threads.pm |  6 +++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ext/threads/t/exit.t b/ext/threads/t/exit.t
index 31b24d9..af6d2be 100644
--- a/ext/threads/t/exit.t
+++ b/ext/threads/t/exit.t
@@ -57,7 +57,7 @@ my $rc = $thr->join();
 ok(! defined($rc), 'Exited: threads->exit()');
 
 
-run_perl(prog => 'use threads 1.66;' .
+run_perl(prog => 'use threads 1.67;' .
                  'threads->exit(86);' .
                  'exit(99);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -107,7 +107,7 @@ $rc = $thr->join();
 ok(! defined($rc), 'Exited: $thr->set_thread_exit_only');
 
 
-run_perl(prog => 'use threads 1.66 qw(exit thread_only);' .
+run_perl(prog => 'use threads 1.67 qw(exit thread_only);' .
                  'threads->create(sub { exit(99); })->join();' .
                  'exit(86);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -117,7 +117,7 @@ run_perl(prog => 'use threads 1.66 qw(exit thread_only);' .
     is($?>>8, 86, "'use threads 'exit' => 'thread_only'");
 }
 
-my $out = run_perl(prog => 'use threads 1.66;' .
+my $out = run_perl(prog => 'use threads 1.67;' .
                            'threads->create(sub {' .
                            '    exit(99);' .
                            '});' .
@@ -133,7 +133,7 @@ my $out = run_perl(prog => 'use threads 1.66;' .
 like($out, '1 finished and unjoined', "exit(status) in thread");
 
 
-$out = run_perl(prog => 'use threads 1.66 qw(exit thread_only);' .
+$out = run_perl(prog => 'use threads 1.67 qw(exit thread_only);' .
                         'threads->create(sub {' .
                         '   threads->set_thread_exit_only(0);' .
                         '   exit(99);' .
@@ -150,7 +150,7 @@ $out = run_perl(prog => 'use threads 1.66 qw(exit thread_only);' .
 like($out, '1 finished and unjoined', "set_thread_exit_only(0)");
 
 
-run_perl(prog => 'use threads 1.66;' .
+run_perl(prog => 'use threads 1.67;' .
                  'threads->create(sub {' .
                  '   $SIG{__WARN__} = sub { exit(99); };' .
                  '   die();' .
diff --git a/ext/threads/t/thread.t b/ext/threads/t/thread.t
index 9784cee..7f4bd12 100644
--- a/ext/threads/t/thread.t
+++ b/ext/threads/t/thread.t
@@ -171,7 +171,7 @@ package main;
 
 # bugid #24165
 
-run_perl(prog => 'use threads 1.66;' .
+run_perl(prog => 'use threads 1.67;' .
                  'sub a{threads->create(shift)} $t = a sub{};' .
                  '$t->tid; $t->join; $t->tid',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -203,7 +203,9 @@ fresh_perl_is(<<'EOI', 'ok', { }, 'void eval return');
 EOI
 
 # test CLONE_SKIP() functionality
-if ($] >= 5.008007) {
+SKIP: {
+    skip('CLONE_SKIP not implemented in Perl < 5.8.7', 5) if ($] < 5.008007);
+
     my %c : shared;
     my %d : shared;
 
@@ -310,13 +312,6 @@ if ($] >= 5.008007) {
             )
         }),
         "counts of calls to DESTROY");
-
-} else {
-    print("ok 29 # Skip objs clone skip at depth 0\n");
-    print("ok 30 # Skip objs clone skip at depth 1\n");
-    print("ok 31 # Skip objs clone skip at depth 2\n");
-    print("ok 32 # Skip counts of calls to CLONE_SKIP\n");
-    print("ok 33 # Skip counts of calls to DESTROY\n");
 }
 
 # EOF
diff --git a/ext/threads/threads.pm b/ext/threads/threads.pm
index 8a3dfcb..a01abc7 100755
--- a/ext/threads/threads.pm
+++ b/ext/threads/threads.pm
@@ -5,7 +5,7 @@ use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '1.66';
+our $VERSION = '1.67';
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -134,7 +134,7 @@ threads - Perl interpreter-based threads
 
 =head1 VERSION
 
-This document describes threads version 1.66
+This document describes threads version 1.67
 
 =head1 SYNOPSIS
 
@@ -990,7 +990,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.66/threads.pm>
+L<http://annocpan.org/~JDHEDDEN/threads-1.67/threads.pm>
 
 Source repository:
 L<http://code.google.com/p/threads-shared/>
-- 
2.7.4