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 6559b5410a41f3ffa53fce7d106b5e78157c24e3..4addf5e7feda074560c0ef783fd0b0959c0d0ed0 100644 (file)
--- 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 0321c20749f411c7cbc6e18d2f8d9a8a444aa3d9..35c8723ff752ebb26573ee24ca5e2ab323a2ddb4 100644 (file)
--- 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 76114da2eac95107e268b8ce9f1a534faed7f37d..3a01f463bbe19124219dac69a05ba0f09e37ad39 100644 (file)
--- 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: $_");
  }
 }