From: Vincent Pit <vince@profvince.com>
Date: Fri, 5 Dec 2008 15:59:36 +0000 (+0100)
Subject: In tests, say 'no/use indirect' inside the eval string, in preparation of 5.8 backport
X-Git-Tag: v0.09~10
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=commitdiff_plain;h=16e155017652cb3e07702075aae4bbdc512e1480

In tests, say 'no/use indirect' inside the eval string, in preparation of 5.8 backport
---

diff --git a/t/10-good.t b/t/10-good.t
index 6559b54..4addf5e 100644
--- a/t/10-good.t
+++ b/t/10-good.t
@@ -23,27 +23,21 @@ sub meh;
  while (<DATA>) {
   chomp;
   s/\s*$//;
+
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect: $_");
-  {
-   no indirect;
-   eval "die qq{ok\n}; $_";
-  }
+
+  eval "die qq{ok\n}; no indirect; $_";
   is($@, "ok\n", "no indirect: $_");
+
   s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, defined: $_");
-  {
-   no indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; no indirect; $_";
   is($@, "ok\n", "no indirect, defined: $_");
  }
 }
diff --git a/t/20-bad.t b/t/20-bad.t
index 0321c20..35c8723 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -27,48 +27,38 @@ sub expect {
  while (<DATA>) {
   chomp;
   s/\s*$//;
+
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Hlagh'), "no indirect: $_");
+
   s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, defined: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Dongs'), "no indirect, defined: $_");
+
   s/\$/\$ \n\t /g;
   s/Dongs/Hlagh/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, spaces: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Hlagh'), "no indirect, spaces: $_");
  }
 }
 
 eval {
- no indirect 'hlagh';
  my $warn;
  local $SIG{__WARN__} = sub { $warn = join ' ', @_ };
- eval "die qq{ok\n}; \$obj = new Hlagh1;";
+ eval "die qq{ok\n}; no indirect 'hlagh'; \$obj = new Hlagh1;";
  is($@, "ok\n", 'no indirect "hlagh" didn\'t croak');
  like($warn, qr/^Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"Hlagh1"/, 'no indirect "hlagh" enables the pragma');
 }
diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
index 76114da..3a01f46 100644
--- a/t/22-bad-mixed.t
+++ b/t/22-bad-mixed.t
@@ -18,27 +18,21 @@ sub meh;
  while (<DATA>) {
   chomp;
   s/\s*$//;
+
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect: $_");
-  {
-   no indirect;
-   eval "die qq{ok\n}; $_";
-  }
+
+  eval "die qq{ok\n}; no indirect; $_";
   is($@, "ok\n", "no indirect: $_");
+
   s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, defined: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"meh"\s+on\s+object\s+"Dongs"/, "no indirect, defined: $_");
  }
 }