Silence experimental warnings on perl 5.17.11+ for given/when in tests

Using if.pm would have been cleaner but it is core only on perl 5.6.2, and
we still support 5.6.1. Moreover, trusting the toolchain on such old perls
is not really an option.

diff --git a/t/05-words.t b/t/05-words.t
index 8a8a583d5d34dc40d663ec0884b76495132e77d5..6971da61f9a1130a507f3302a1c880b76cd97ee3 100644 (file)
--- a/t/05-words.t
+++ b/t/05-words.t
@@ -210,6 +210,12 @@ SKIP: {
                                                                 if "$]" < 5.010;
 
  eval <<'TEST_GIVEN';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   my $desc = 'given';
   my $base = HERE;
@@ -224,6 +230,12 @@ TEST_GIVEN
  diag $@ if $@;
 
  eval <<'TEST_GIVEN_WHEN';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   my $desc = 'when in given';
   my $base = HERE;
@@ -241,6 +253,12 @@ TEST_GIVEN_WHEN
  diag $@ if $@;
 
  eval <<'TEST_GIVEN_DEFAULT';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   my $desc = 'default in given';
   my $base = HERE;
@@ -258,6 +276,12 @@ TEST_GIVEN_DEFAULT
  diag $@ if $@;
 
  eval <<'TEST_FOR_WHEN';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   my $desc = 'when in for';
   my $base = HERE;

diff --git a/t/13-reap-ctl.t b/t/13-reap-ctl.t
index 6208642a9ccd595ef03a10d38b21dbb58c49bedf..e4e47b5e0f9db9b46954a11d4911a83de379d441 100644 (file)
--- a/t/13-reap-ctl.t
+++ b/t/13-reap-ctl.t
@@ -140,6 +140,12 @@ SKIP:
  skip 'Perl 5.10 required to test given/when' => 30 if "$]" < 5.010;
 
  eval <<' GIVEN_TEST_1';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -161,6 +167,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_2';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -184,6 +196,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_3';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -205,6 +223,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_4';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -228,6 +252,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_5';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {

diff --git a/t/23-localize-ctl.t b/t/23-localize-ctl.t
index 5f4046ea4b44fdd649c7852755b8021bd0496f7d..b72be227f4a8ca94783e56af611df612761852e0 100644 (file)
--- a/t/23-localize-ctl.t
+++ b/t/23-localize-ctl.t
@@ -193,6 +193,12 @@ SKIP:
  skip 'Perl 5.10 required to test given/when' => 30 if "$]" < 5.010;
 
  eval <<' GIVEN_TEST_1';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -214,6 +220,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_2';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -237,6 +249,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_3';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -258,6 +276,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_4';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -281,6 +305,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_5';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {

diff --git a/t/55-yield-target.t b/t/55-yield-target.t
index f927d20767d85689dd2bb31652861993f53497f7..ced05c8bbcdca6c6d7fb5ed9b80b887420210d07 100644 (file)
--- a/t/55-yield-target.t
+++ b/t/55-yield-target.t
@@ -83,6 +83,12 @@ SKIP: {
                                                                 if "$]" < 5.010;
 
  @res = eval <<'TESTCASE';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   (24, do {
    given (25) {
@@ -98,6 +104,12 @@ TESTCASE
  # end of the enclosing given block.
  @res = ();
  eval <<'TESTCASE';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   @res = (28, do {
    given (29) {
@@ -115,6 +127,12 @@ TESTCASE
  # But calling yield() in when() in for() sends us at the next iteration.
  @res = ();
  eval <<'TESTCASE';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   @res = (31, do {
    for (32, 33) {

diff --git a/t/lib/Scope/Upper/TestGenerator.pm b/t/lib/Scope/Upper/TestGenerator.pm
index c71b8f36f2f7c925f79b0679a2b56fe8501e28f6..b4f6e1b6762d26e8aa179c468adbf54da8e70b6f 100644 (file)
--- a/t/lib/Scope/Upper/TestGenerator.pm
+++ b/t/lib/Scope/Upper/TestGenerator.pm
@@ -39,6 +39,11 @@ my %exports = (
 );
 
 sub import {
+ if ("$]" >= 5.017_011) {
+  require warnings;
+  warnings->unimport('experimental::smartmatch');
+ }
+
  if ("$]" >= 5.010_001) {
   require feature;
   feature->import('switch');