As we're not passing over (or copying in) a NUL, don't need that extra

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

diff --git a/ext/threads/t/stress_re.t b/ext/threads/t/stress_re.t
index cfee92f..6ba36ed 100644 (file)
--- a/ext/threads/t/stress_re.t
+++ b/ext/threads/t/stress_re.t
@@ -1,53 +1,61 @@
+use strict;
+use warnings;
+
 BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
-    require Config; import Config;
-    unless ($Config{'useithreads'}) {
-       print "1..0 # Skip: no useithreads\n";
-       exit 0; 
+    if ($ENV{'PERL_CORE'}){
+        chdir 't';
+        unshift @INC, '../lib';
+    }
+    use Config;
+    if (! $Config{'useithreads'}) {
+        print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
+        exit(0);
     }
 }
 
 use ExtUtils::testlib;
-use strict;
-BEGIN { print "1..64\n" };
-use threads;
-
-
-print "ok 1\n";
-
-
 
-
-sub ok {       
+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";
+    if ($ok) {
+        print("ok $id - $name\n");
+    } else {
+        print("not ok $id - $name\n");
+        printf("# Failed test at line %d\n", (caller)[2]);
+    }
 
-    printf "# Failed test at line %d\n", (caller)[2] unless $ok;
-    
-    return $ok;
+    return ($ok);
 }
 
+BEGIN {
+    $| = 1;
+    print("1..31\n");   ### Number of tests that will be run ###
+};
+
+use threads;
+ok(1, 1, 'Loaded');
+
+### Start of Testing ###
 
-ok(2,1,"");
+my $cnt = 30;
 
-sub test9 {
-  my $s = "abcd" x (1000 + $_);
-  my $t = '';
-  while ($s =~ /(.)/g) { $t .= $1 }
-  print "not ok $_[0]\n" if $s ne $t;
+sub stress_re {
+    my $s = "abcd" x (1000 + $_[0]);
+    my $t = '';
+    while ($s =~ /(.)/g) { $t .= $1 }
+    return ($s eq $t) ? 'ok' : 'not';
 }
+
 my @threads;
-for(3..33) {
-  ok($_,1,"Multiple thread test");
-  push @threads ,threads->create('test9',$_);
+for (1..$cnt) {
+    push(@threads, threads->create('stress_re', $_));
 }
 
-my $i = 34;
-for(@threads) {
-  $_->join;
-  ok($i++,1,"Thread joined");
+for (1..$cnt) {
+    my $result = $threads[$_-1]->join;
+    ok($_+1, defined($result) && ($result eq 'ok'), "stress re - iter $_");
 }
 
+# EOF