X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F22-bad-mixed.t;h=4462bf661462a53a5219d7e63661b46b932a7c30;hb=8291ef989ac98ee2cb53a6098eed7aa7c3ed0ca8;hp=76114da2eac95107e268b8ce9f1a534faed7f37d;hpb=b92e3c9567e42b06df65b6d857bb647fe1bee651;p=perl%2Fmodules%2Findirect.git

diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
index 76114da..4462bf6 100644
--- a/t/22-bad-mixed.t
+++ b/t/22-bad-mixed.t
@@ -14,36 +14,41 @@ use Test::More tests => 3 * 4;
 sub meh;
 
 {
- local $/ = "####\n";
+ local $/ = "####";
  while (<DATA>) {
   chomp;
   s/\s*$//;
-  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
-  is($@, "ok\n", "use indirect: $_");
-  {
-   no indirect;
-   eval "die qq{ok\n}; $_";
-  }
-  is($@, "ok\n", "no indirect: $_");
-  s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
-  is($@, "ok\n", "use indirect, defined: $_");
+  s/(.*?)$//m;
+  my ($skip, $prefix) = split /#+/, $1;
+  $skip   = 0  unless defined $skip;
+  $prefix = '' unless defined $prefix;
+  s/\s*//;
+
+SKIP:
   {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
+   skip "$_: $skip" => 4 if eval $skip;
+
+   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+
+   eval "die qq{ok\\n}; $prefix; use indirect; $_";
+   is($@, "ok\n", "use indirect: $_");
+
+   eval "die qq{ok\n}; $prefix; no indirect; $_";
+   is($@, "ok\n", "no indirect: $_");
+
+   s/Hlagh/Dongs/g;
+
+   eval "die qq{ok\\n}; $prefix; use indirect; $_";
+   is($@, "ok\n", "use indirect, defined: $_");
+
+   eval "die qq{the code compiled but it shouldn't have\n}; $prefix; no indirect; $_";
+   like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"meh"\s+on\s+object\s+"Dongs"\s+at\s+\(eval\s+\d+\)\s+line\s+\d+/, "no indirect, defined: $_");
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"meh"\s+on\s+object\s+"Dongs"/, "no indirect, defined: $_");
  }
 }
 
 __DATA__
+
 meh Hlagh->new;
 ####
 meh Hlagh->new();