Better handling of extraneous warnings in t/30-scope.t

diff --git a/t/30-scope.t b/t/30-scope.t
index f3586890c876e2583128df3b1f2682695d22cd48..20eeebbde73ff50d4c13a2ab519b280af4d399c6 100644 (file)
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -17,20 +17,19 @@ sub expect {
 
 {
  my $code = do { local $/; <DATA> };
- my @warns;
+ my (%res, @left);
  {
-  local $SIG{__WARN__} = sub { push @warns, join '', 'warn:', @_ };
+  local $SIG{__WARN__} = sub {
+   my $w = join '', 'warn:', @_;
+   if ($w =~ /"P(\d+)"/ and not exists $res{$1}) {
+    $res{$1} = $w;
+   } else {
+    push @left, $w;
+   }
+  };
   eval "die qq{ok\\n}; $code";
   is($@, "ok\n", 'DATA compiled fine');
  }
- my $left = 0;
- my %res = map {
-  if (/"P(\d+)"/) {
-   $1 => $_
-  } else {
-   ++$left; ()
-  }
- } @warns;
  for (1 .. $tests) {
   my $w = $res{$_};
   if ($wrong{$_}) {
@@ -39,7 +38,8 @@ sub expect {
    is($w, undef, "$_ shouldn't warn");
   }
  }
- is($left, 0, 'nothing left');
+ is(@left, 0, 'nothing left');
+ diag "Extraneous warnings:\n", @left if @left;
 }
 
 {