Modified BEGIN blocks to better suit test coverage

stevieb9 · Jan 12, 2016 · 6424bfa · 6424bfa
1 parent 4c1568e
commit 6424bfa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/lib/Devel/Examine/Subs.pm b/lib/Devel/Examine/Subs.pm
@@ -30,7 +30,7 @@ BEGIN {
         import Devel::Trace::Subs qw(trace);
     };
 
-    if ($@){
+    if ($@ || ! defined &trace){
         *trace = sub {};
     }
 };

diff --git a/lib/Devel/Examine/Subs/Engine.pm b/lib/Devel/Examine/Subs/Engine.pm
@@ -24,7 +24,7 @@ BEGIN {
         import Devel::Trace::Subs qw(trace);
     };
 
-    if ($@){
+    if ($@ || ! defined &trace){
         *trace = sub {};
     }
 };

diff --git a/lib/Devel/Examine/Subs/Postprocessor.pm b/lib/Devel/Examine/Subs/Postprocessor.pm
@@ -21,7 +21,7 @@ BEGIN {
         import Devel::Trace::Subs qw(trace);
     };
 
-    if ($@){
+    if ($@ || ! defined &trace){
         *trace = sub {};
     }
 };

diff --git a/lib/Devel/Examine/Subs/Preprocessor.pm b/lib/Devel/Examine/Subs/Preprocessor.pm
@@ -10,17 +10,19 @@ use Data::Dumper;
 
 BEGIN {
 
-    # we need to do some trickery for DTS due to a circular install
+    # we need to do some trickery for DTS due to circular referencing,
+    # which broke CPAN installs.
 
     eval {
         require Devel::Trace::Subs;
     };
 
-    if ($@){
-        *trace = sub {};
-    }
-    else {
+    eval {
         import Devel::Trace::Subs qw(trace);
+    };
+
+    if ($@ || ! defined &trace){
+        *trace = sub {};
     }
 };
 

diff --git a/lib/Devel/Examine/Subs/Sub.pm b/lib/Devel/Examine/Subs/Sub.pm
@@ -15,11 +15,12 @@ BEGIN {
         require Devel::Trace::Subs;
     };
 
-    if ($@){
-        *trace = sub {};
-    }
-    else {
+    eval {
         import Devel::Trace::Subs qw(trace);
+    };
+
+    if ($@ || ! defined &trace){
+        *trace = sub {};
     }
 };