Update Changes.

[p5sagit/p5-mst-13.2.git] / ext / threads / t / basic.t

diff --git a/ext/threads/t/basic.t b/ext/threads/t/basic.t
index c1fbbf9..fa9a655 100755 (executable)
--- a/ext/threads/t/basic.t
+++ b/ext/threads/t/basic.t
@@ -6,7 +6,7 @@
 #
 # And even when that will be fixed, this is a basic
 # test and should not rely on shared variables
-# 
+#
 # This will test the basic API, it will not use any coderefs
 # as they are more advanced
 #
@@ -25,7 +25,7 @@ BEGIN {
 
 use ExtUtils::testlib;
 use strict;
-BEGIN { print "1..12\n" };
+BEGIN { $| = 1; print "1..15\n" };
 use threads;
 
 
@@ -40,12 +40,12 @@ print "ok 1\n";
 
 sub ok {       
     my ($id, $ok, $name) = @_;
-    
+
     # You have to do it this way or VMS will get confused.
     print $ok ? "ok $id - $name\n" : "not ok $id - $name\n";
 
     printf "# Failed test at line %d\n", (caller)[2] unless $ok;
-    
+
     return $ok;
 }
 
@@ -69,7 +69,7 @@ threads->create('test3',1)->join();
 
 
 #check Config
-ok(5, 1 == $Config::threads,"Check that Config::threads is true");
+ok(5, 1 == $threads::threads,"Check that threads::threads is true");
 
 #test trying to detach thread
 
@@ -78,6 +78,7 @@ sub test4 { ok(6,1,"Detach test") }
 my $thread1 = threads->create('test4');
 
 $thread1->detach();
+threads->yield; # help out non-preemptive thread implementations
 sleep 2;
 ok(7,1,"Detach test");
 
@@ -96,24 +97,24 @@ threads->create('test5')->join();
 
 sub test7 {
        my $self = threads->self();
-       ok(9, $self->tid == 7, "Wanted 7, got ".$self->tid);
-       ok(10, threads->tid() == 7, "Wanted 7, got ".threads->tid());
+       ok(10, $self->tid == 7, "Wanted 7, got ".$self->tid);
+       ok(11, threads->tid() == 7, "Wanted 7, got ".threads->tid());
 }
 
 threads->create('test7')->join;
 
 sub test8 {
        my $self = threads->self();
-       ok(11, $self->tid == 8, "Wanted 8, got ".$self->tid);
-       ok(12, threads->tid() == 8, "Wanted 8, got ".threads->tid());
+       ok(12, $self->tid == 8, "Wanted 8, got ".$self->tid);
+       ok(13, threads->tid() == 8, "Wanted 8, got ".threads->tid());
 }
 
 threads->create('test8')->join;
 
 
 #check support for threads->self() in main thread
-ok(13, 0 == threads->self->tid(),"Check so that tid for threads work for main thread");
-ok(14, 0 == threads->tid(),"Check so that tid for threads work for main thread");
+ok(14, 0 == threads->self->tid(),"Check so that tid for threads work for main thread");
+ok(15, 0 == threads->tid(),"Check so that tid for threads work for main thread");
 
 1;