threads - formatting [REVISED]

[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 8892bce..1501d77 100755 (executable)
--- a/ext/threads/t/basic.t
+++ b/ext/threads/t/basic.t
@@ -7,18 +7,34 @@ BEGIN {
         unshift @INC, '../lib';
     }
     use Config;
-    unless ($Config{'useithreads'}) {
-       print "1..0 # Skip: no useithreads\n";
-       exit 0; 
+    if (! $Config{'useithreads'}) {
+        print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+        exit(0);
     }
 }
 
 use ExtUtils::testlib;
 
-BEGIN { $| = 1; print "1..32\n" };
-use threads;
+sub ok {
+    my ($id, $ok, $name) = @_;
 
+    # You have to do it this way or VMS will get confused.
+    if ($ok) {
+        print("ok $id - $name\n");
+    } else {
+        print("not ok $id - $name\n");
+        printf("# Failed test at line %d\n", (caller)[2]);
+    }
 
+    return ($ok);
+}
+
+BEGIN {
+    $| = 1;
+    print("1..32\n");   ### Number of tests that will be run ###
+};
+
+use threads;
 
 if ($threads::VERSION && ! exists($ENV{'PERL_CORE'})) {
     print(STDERR "# Testing threads $threads::VERSION\n");
@@ -28,102 +44,88 @@ ok(1, 1, 'Loaded');
 
 ### Start of Testing ###
 
-
-
-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;
-}
-
+ok(2, 1 == $threads::threads, "Check that threads::threads is true");
 
 sub test1 {
-       ok(2,'bar' eq $_[0],"Test that argument passing works");
+    ok(3,'bar' eq $_[0], "Test that argument passing works");
 }
-threads->create('test1','bar')->join();
+threads->create('test1', 'bar')->join();
 
 sub test2 {
-       ok(3,'bar' eq $_[0]->[0]->{foo},"Test that passing arguments as references work");
+    ok(4,'bar' eq $_[0]->[0]->{'foo'}, "Test that passing arguments as references work");
 }
+threads->create(\&test2, [{'foo' => 'bar'}])->join();
 
-threads->create(\&test2,[{foo => 'bar'}])->join();
-
-
-#test execuion of normal sub
-sub test3 { ok(4,shift() == 1,"Test a normal sub") }
-threads->create(\&test3,1)->join();
-
-
-#check Config
-ok(5, 1 == $threads::threads,"Check that threads::threads is true");
-
-#test trying to detach thread
+sub test3 {
+    ok(5, shift() == 1, "Test a normal sub");
+}
+threads->create(\&test3, 1)->join();
 
-sub test4 { ok(6,1,"Detach test") }
 
-my $thread1 = threads->create('test4');
+sub test4 {
+    ok(6, 1, "Detach test");
+}
+{
+    my $thread1 = threads->create('test4');
+    $thread1->detach();
+}
 
-$thread1->detach();
 threads->yield; # help out non-preemptive thread implementations
 sleep 2;
-ok(7,1,"Detach test");
 
+ok(7, 1, "Detach test");
 
 
 sub test5 {
-       threads->create('test6')->join();
-       ok(9,1,"Nested thread test");
+    threads->create('test6')->join();
+    ok(9, 1, "Nested thread test");
 }
 
 sub test6 {
-       ok(8,1,"Nested thread test");
+    ok(8, 1, "Nested thread test");
 }
 
 threads->create('test5')->join();
 
+
 sub test7 {
-       my $self = threads->self();
-       ok(10, $self->tid == 7, "Wanted 7, got ".$self->tid);
-       ok(11, threads->tid() == 7, "Wanted 7, got ".threads->tid());
+    my $self = threads->self();
+    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(12, $self->tid == 8, "Wanted 8, got ".$self->tid);
-       ok(13, threads->tid() == 8, "Wanted 8, got ".threads->tid());
+    my $self = threads->self();
+    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(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");
+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");
 
 {
-       no warnings;
-    local *CLONE = sub { ok(16, threads->tid() == 9, "Tid should be correct in the clone")};
-    threads->create(sub { ok(17, threads->tid() == 9, "And tid be 9 here too") })->join();
+    no warnings;
+    local *CLONE = sub {
+        ok(16, threads->tid() == 9, "Tid should be correct in the clone");
+    };
+    threads->create(sub {
+        ok(17, threads->tid() == 9, "And tid be 9 here too");
+    })->join();
 }
 
-{ 
-
-    sub Foo::DESTROY { 
-       ok(19, threads->tid() == 10, "In destroy it should be correct too" )
-       }
+{
+    sub Foo::DESTROY {
+        ok(19, threads->tid() == 10, "In destroy it should be correct too" )
+    }
     my $foo;
-    threads->create(sub { ok(18, threads->tid() == 10, "And tid be 10 here");
-                         $foo = bless {}, 'Foo';                         
-                         return undef;
-                     })->join();
-
+    threads->create(sub {
+        ok(18, threads->tid() == 10, "And tid be 10 here");
+        $foo = bless {}, 'Foo';
+        return undef;
+    })->join();
 }