Plant a better diagnostic for when the xs shim cached detection fails

diff --git a/lib/Class/Accessor/Grouped.pm b/lib/Class/Accessor/Grouped.pm
index 8925c8e..3317c16 100644 (file)
--- a/lib/Class/Accessor/Grouped.pm
+++ b/lib/Class/Accessor/Grouped.pm
@@ -546,7 +546,7 @@ BEGIN {
   *__CAG_TRACK_UNDEFER_FAIL = (
     $INC{'Test/Builder.pm'} || $INC{'Test/Builder2.pm'}
       and
-    $0 =~ m|^ x?t [\/\\] .+ \.t $|x
+    $0 =~ m|^ x?t / .+ \.t $|x
   ) ? sub () { 1 }
     : sub () { 0 }
   ;

diff --git a/t/accessors_xs_cachedwarn.t b/t/accessors_xs_cachedwarn.t
index 14149c5..7b9dfaf 100644 (file)
--- a/t/accessors_xs_cachedwarn.t
+++ b/t/accessors_xs_cachedwarn.t
@@ -1,8 +1,5 @@
 use strict;
 use warnings;
-use FindBin qw($Bin);
-use File::Spec::Functions;
-use File::Spec::Unix (); # need this for %INC munging
 use Test::More;
 use lib 't/lib';
 
@@ -42,6 +39,9 @@ is (
   scalar (grep { $_ =~ /^\QDeferred version of method AccessorGroups::singlefield invoked more than once/ } @w),
   3,
   '3 warnings produced as expected on cached invocation during testing',
-);
+) or do {
+  require Data::Dumper;
+  diag "\n \$0 is: " . Data::Dumper->new([$0])->Useqq(1)->Terse(1)->Dump;
+};
 
 done_testing;