Set PERL_DESTRUCT_LEVEL through the environment variable on debugging perls

[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 c6639a63ba3e2d8e3e6815d0dc604be7c096af54..34c4b5983f11c15cc5ca9ea14ff7376ea3ed2a96 100644 (file)
--- a/t/lib/Variable/Magic/TestGlobalDestruction.pm
+++ b/t/lib/Variable/Magic/TestGlobalDestruction.pm
@@ -68,28 +68,29 @@ sub import {
  my $level = $args{level};
  $level    = 1 unless defined $level;
 
- if ("$]" < 5.013_004 and not $ENV{PERL_VARIABLE_MAGIC_TEST_THREADS}) {
+ if ("$]" < 5.013_004 and not $ENV{PERL_FORCE_TEST_THREADS}) {
   _diag("perl 5.13.4 required to safely test global destruction");
   return 0;
  }
 
  my $env_level = $ENV{PERL_DESTRUCT_LEVEL};
  if (defined $env_level) {
-  $env_level = do {
-   no warnings 'numeric';
-   int $env_level;
-  };
+  no warnings 'numeric';
+  $env_level = int $env_level;
+ }
 
-  my $is_debugging = is_debugging_perl();
-  if ($is_debugging) {
-   my $ignoring = $env_level < $level ? ', ignoring' : '';
-   _diag("Global destruction level $env_level set by PERL_DESTRUCT_LEVEL (debugging perl)$ignoring");
-   unless ($ignoring) {
-    return 1;
-   }
+ my $is_debugging = is_debugging_perl();
+ if ($is_debugging) {
+  if (defined $env_level) {
+   _diag("Global destruction level $env_level set by PERL_DESTRUCT_LEVEL (environment)");
+   return ($env_level >= $level) ? 1 : 0;
   } else {
-   _diag("PERL_DESTRUCT_LEVEL is set to $env_level, but this perl doesn't seem to have debugging enabled, ignoring");
+   $ENV{PERL_DESTRUCT_LEVEL} = $level;
+   _diag("Global destruction level $level set by PERL_DESTRUCT_LEVEL (forced)");
+   return 1;
   }
+ } elsif (defined $env_level) {
+  _diag("PERL_DESTRUCT_LEVEL is set to $env_level, but this perl doesn't seem to have debugging enabled, ignoring");
  }
 
  my $has_perl_destruct_level = do {