base.pm now repeatedly require()s modules, exposing missing Exporter exemption

diff --git a/Changes b/Changes
index 97c47c9..ca04ec7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -30,6 +30,7 @@ Revision history for DBIx::Class
         - Fix dbicadmin to no longer ignore the documented 'config' option
         - The schema-resultsource entanglement is now much more robust
           under threads
+        - t/53lean_startup.t adjusted for new 5.15.x base.pm behavior
 
     * Misc
         - Centralized leak-checks for all instances of DBICTest::Schema

diff --git a/t/53lean_startup.t b/t/53lean_startup.t
index 8af340a..f1752f4 100644 (file)
--- a/t/53lean_startup.t
+++ b/t/53lean_startup.t
@@ -17,7 +17,7 @@ BEGIN {
 use strict;
 use warnings;
 use Test::More;
-use Data::Dumper;
+use DBICTest::Util 'stacktrace';
 
 # Package::Stash::XS is silly and fails if a require hook contains regular
 # expressions on perl < 5.8.7. Load the damned thing if the case
@@ -35,6 +35,7 @@ BEGIN {
     base
     mro
     overload
+    Exporter
 
     B
     locale
@@ -94,13 +95,7 @@ BEGIN {
     ) {
       fail ("Unexpected require of '$req' by $caller[0] ($caller[1] line $caller[2])");
 
-      if ($ENV{TEST_VERBOSE}) {
-        my ($i, @stack) = 1;
-        while (my @f = caller($i++) ) {
-          push @stack, \@f;
-        }
-        diag Dumper(\@stack);
-      }
+      diag( 'Require invoked' .  stacktrace() ) if $ENV{TEST_VERBOSE};
     }
   };
 }