Clean up threads tests a bit

diff --git a/t/40-threads.t b/t/40-threads.t
index 3b850e3c89236c7eb4e8db9a359421d7fcc14b5b..1a3d5ab888324d9336138b6cc56190ce56c25f51 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -17,52 +17,87 @@ my $destroyed : shared = 0;
 
 sub try {
  my ($dispell, $op_info) = @_;
 
 sub try {
  my ($dispell, $op_info) = @_;

- my $tid = threads->tid();
- my $c   = 0;
- my $wiz = eval {
-  wizard data    => sub { $_[1] + $tid },
-         get     => sub { ++$c; 0 },
-         set     => sub {
-                     my $op = $_[-1];
-                     if ($op_info == VMG_OP_INFO_OBJECT) {
-                      is_deeply { class => ref($op),   name => $op->name },
-                                { class => 'B::BINOP', name => 'sassign' },
-                                "op object in thread $tid is correct";
-                     } else {
-                      is $op, 'sassign', "op name in thread $tid is correct";
-                     }
-                     0
-                    },
-         free    => sub { lock $destroyed; ++$destroyed; 0 },
-         op_info => $op_info
- };
- is($@,     '',    "wizard in thread $tid doesn't croak");
- isnt($wiz, undef, "wizard in thread $tid is defined");
- is($c,     0,     "wizard in thread $tid doesn't trigger magic");
+ my $tid = threads->tid;
+
+ my $c = 0;
+ my $wiz;
+
+ {
+  local $@;
+  $wiz = eval {
+   wizard(
+    data    => sub { $_[1] + $tid },
+    get     => sub { ++$c; 0 },
+    set     => sub {
+     my $op = $_[-1];
+
+     if ($op_info == VMG_OP_INFO_OBJECT) {
+      is_deeply { class => ref($op),   name => $op->name },
+                { class => 'B::BINOP', name => 'sassign' },
+                "op object in thread $tid is correct";
+     } else {
+      is $op, 'sassign', "op name in thread $tid is correct";
+     }
+
+     return 0;
+    },
+    free    => sub { lock $destroyed; ++$destroyed; 0 },
+    op_info => $op_info,
+   );
+  };
+  is $@,     '',    "wizard in thread $tid doesn't croak";
+  isnt $wiz, undef, "wizard in thread $tid is defined";
+  is $c,     0,     "wizard in thread $tid doesn't trigger magic";
+ }
+

  my $a = 3;
  my $a = 3;

- my $res = eval { cast $a, $wiz, sub { 5 }->() };
- is($@, '', "cast in thread $tid doesn't croak");
- is($c, 0,  "cast in thread $tid doesn't trigger magic");
- my $b;
- eval { $b = $a };
- is($@, '', "get in thread $tid doesn't croak");
- is($b, 3,  "get in thread $tid returns the right thing");
- is($c, 1,  "get in thread $tid triggers magic");
- my $d = eval { getdata $a, $wiz };
- is($@, '',       "getdata in thread $tid doesn't croak");
- is($d, 5 + $tid, "getdata in thread $tid returns the right thing");
- is($c, 1,        "getdata in thread $tid doesn't trigger magic");
- eval { $a = 9 };
- is($@, '', "set in thread $tid (check opname) doesn't croak");
- if ($dispell) {
-  $res = eval { dispell $a, $wiz };
-  is($@, '', "dispell in thread $tid doesn't croak");
-  is($c, 1,  "dispell in thread $tid doesn't trigger magic");
-  undef $b;
+
+ {
+  local $@;
+  my $res = eval { cast $a, $wiz, sub { 5 }->() };
+  is $@, '', "cast in thread $tid doesn't croak";
+  is $c, 0,  "cast in thread $tid doesn't trigger magic";
+ }
+
+ {
+  local $@;
+  my $b;

   eval { $b = $a };
   eval { $b = $a };

-  is($@, '', "get in thread $tid after dispell doesn't croak");
-  is($b, 9,  "get in thread $tid after dispell returns the right thing");
-  is($c, 1,  "get in thread $tid after dispell doesn't trigger magic");
+  is $@, '', "get in thread $tid doesn't croak";
+  is $b, 3,  "get in thread $tid returns the right thing";
+  is $c, 1,  "get in thread $tid triggers magic";
+ }
+
+ {
+  local $@;
+  my $d = eval { getdata $a, $wiz };
+  is $@, '',       "getdata in thread $tid doesn't croak";
+  is $d, 5 + $tid, "getdata in thread $tid returns the right thing";
+  is $c, 1,        "getdata in thread $tid doesn't trigger magic";
+ }
+
+ {
+  local $@;
+  eval { $a = 9 };
+  is $@, '', "set in thread $tid (check opname) doesn't croak";
+ }
+
+ if ($dispell) {
+  {
+   local $@;
+   my $res = eval { dispell $a, $wiz };
+   is $@, '', "dispell in thread $tid doesn't croak";
+   is $c, 1,  "dispell in thread $tid doesn't trigger magic";
+  }
+
+  {
+   local $@;
+   my $b;
+   eval { $b = $a };
+   is $@, '', "get in thread $tid after dispell doesn't croak";
+   is $b, 9,  "get in thread $tid after dispell returns the right thing";
+   is $c, 1,  "get in thread $tid after dispell doesn't trigger magic";
+  }

  }
  return; # Ugly if not here
 }
  }
  return; # Ugly if not here
 }

diff --git a/t/41-clone.t b/t/41-clone.t
index 1bfe6b5b3f5f53add4816fbf4aae2a131e6b936e..6214741724b8e72c2d4123891873b9b9686735d4 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -19,55 +19,88 @@ my $c         : shared = 0;
 sub spawn_wiz {
  my ($op_info) = @_;
 
 sub spawn_wiz {
  my ($op_info) = @_;
 

+ my $desc = "wizard with op_info $op_info in main thread";
+
+ local $@;

  my $wiz = eval {
  my $wiz = eval {

-  wizard data    => sub { $_[1] + threads->tid() },
-         get     => sub { lock $c; ++$c; 0 },
-         set     => sub {
-                     my $op = $_[-1];
-                     my $tid = threads->tid();
-                     if ($op_info == VMG_OP_INFO_OBJECT) {
-                      is_deeply { class => ref($op),   name => $op->name },
-                                { class => 'B::BINOP', name => 'sassign' },
-                                "op object in thread $tid is correct";
-                     } else {
-                      is $op, 'sassign', "op name in thread $tid is correct";
-                     }
-                     0
-                    },
-         free    => sub { lock $destroyed; ++$destroyed; 0 },
-         op_info => $op_info
+  wizard(
+   data    => sub { $_[1] + threads->tid() },
+   get     => sub { lock $c; ++$c; 0 },
+   set     => sub {
+    my $op = $_[-1];
+    my $tid = threads->tid();
+
+    if ($op_info == VMG_OP_INFO_OBJECT) {
+     is_deeply { class => ref($op),   name => $op->name },
+               { class => 'B::BINOP', name => 'sassign' },
+               "op object in thread $tid is correct";
+    } else {
+     is $op, 'sassign', "op name in thread $tid is correct";
+    }
+
+    return 0
+   },
+   free    => sub { lock $destroyed; ++$destroyed; 0 },
+   op_info => $op_info,
+  );

  };
  };

- is($@,     '',    "wizard with op_info $op_info in main thread doesn't croak");
- isnt($wiz, undef, "wizard with op_info $op_info in main thread is defined");
- is($c,     0,     "wizard with op_info $op_info in main thread doesn't trigger magic");
+ is $@,     '',    "$desc doesn't croak";
+ isnt $wiz, undef, "$desc is defined";
+ is $c,     0,     "$desc doesn't trigger magic";

 
  return $wiz;
 }
 
 sub try {
  my ($dispell, $wiz) = @_;
 
  return $wiz;
 }
 
 sub try {
  my ($dispell, $wiz) = @_;

- my $tid = threads->tid();
- my $a   = 3;
- my $res = eval { cast $a, $wiz, sub { 5 }->() };
- is($@, '', "cast in thread $tid doesn't croak");
- my $b;
- eval { $b = $a };
- is($@, '', "get in thread $tid doesn't croak");
- is($b, 3,  "get in thread $tid returns the right thing");
- my $d = eval { getdata $a, $wiz };
- is($@, '',       "getdata in thread $tid doesn't croak");
- is($d, 5 + $tid, "getdata in thread $tid returns the right thing");
- eval { $a = 9 };
- is($@, '', "set in thread $tid (check opname) doesn't croak");
- if ($dispell) {
-  $res = eval { dispell $a, $wiz };
-  is($@, '', "dispell in thread $tid doesn't croak");
-  undef $b;
+ my $tid = threads->tid;
+
+ my $a = 3;
+
+ {
+  local $@;
+  my $res = eval { cast $a, $wiz, sub { 5 }->() };
+  is $@, '', "cast in thread $tid doesn't croak";
+ }
+
+ {
+  local $@;
+  my $b;

   eval { $b = $a };
   eval { $b = $a };

-  is($@, '', "get in thread $tid after dispell doesn't croak");
-  is($b, 9,  "get in thread $tid after dispell returns the right thing");
+  is $@, '', "get in thread $tid doesn't croak";
+  is $b, 3,  "get in thread $tid returns the right thing";

  }
  }

- return; # Ugly if not here
+
+ {
+  local $@;
+  my $d = eval { getdata $a, $wiz };
+  is $@, '',       "getdata in thread $tid doesn't croak";
+  is $d, 5 + $tid, "getdata in thread $tid returns the right thing";
+ }
+
+ {
+  local $@;
+  eval { $a = 9 };
+  is $@, '', "set in thread $tid (check opname) doesn't croak";
+ }
+
+ if ($dispell) {
+  {
+   local $@;
+   my $res = eval { dispell $a, $wiz };
+   is $@, '', "dispell in thread $tid doesn't croak";
+  }
+
+  {
+   local $@;
+   my $b;
+   eval { $b = $a };
+   is $@, '', "get in thread $tid after dispell doesn't croak";
+   is $b, 9,  "get in thread $tid after dispell returns the right thing";
+  }
+ }
+
+ return;

 }
 
 my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;
 }
 
 my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;