Revamp PERL_DESTRUCT_LEVEL handling

[perl/modules/Variable-Magic.git] / t / lib / Variable / Magic / TestGlobalDestruction.pm

diff --git a/t/lib/Variable/Magic/TestGlobalDestruction.pm b/t/lib/Variable/Magic/TestGlobalDestruction.pm
index 83f88bbfe1fb9ee726c2486385ef2a8f151e99aa..c6639a63ba3e2d8e3e6815d0dc604be7c096af54 100644 (file)
--- a/t/lib/Variable/Magic/TestGlobalDestruction.pm
+++ b/t/lib/Variable/Magic/TestGlobalDestruction.pm
@@ -63,24 +63,33 @@ sub is_debugging_perl {
 
 sub import {
  shift;
- my %args  = @_;
- my $level = $args{level} || 1;
+ my %args = @_;
+
+ my $level = $args{level};
+ $level    = 1 unless defined $level;
 
  if ("$]" < 5.013_004 and not $ENV{PERL_VARIABLE_MAGIC_TEST_THREADS}) {
   _diag("perl 5.13.4 required to safely test global destruction");
   return 0;
  }
 
- my $env_level = int($ENV{PERL_DESTRUCT_LEVEL} || 0);
- if ($env_level >= $level) {
-  my $is_debugging = is_debugging_perl();
+ my $env_level = $ENV{PERL_DESTRUCT_LEVEL};
+ if (defined $env_level) {
+  $env_level = do {
+   no warnings 'numeric';
+   int $env_level;
+  };
 
+  my $is_debugging = is_debugging_perl();
   if ($is_debugging) {
-   _diag("Global destruction level $env_level set by PERL_DESTRUCT_LEVEL (debugging perl)");
-   return 1;
+   my $ignoring = $env_level < $level ? ', ignoring' : '';
+   _diag("Global destruction level $env_level set by PERL_DESTRUCT_LEVEL (debugging perl)$ignoring");
+   unless ($ignoring) {
+    return 1;
+   }
+  } else {
+   _diag("PERL_DESTRUCT_LEVEL is set to $env_level, but this perl doesn't seem to have debugging enabled, ignoring");
   }
-
-  _diag("PERL_DESTRUCT_LEVEL is set to $env_level, but this perl doesn't seem to have debugging enabled");
  }
 
  my $has_perl_destruct_level = do {