[Bast-commits] r9810 - in Class-Accessor-Grouped/trunk: lib/Class/Accessor t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-12-16 09:28:47 +0000 (Thu, 16 Dec 2010)
New Revision: 9810

Modified:
   Class-Accessor-Grouped/trunk/lib/Class/Accessor/Grouped.pm
   Class-Accessor-Grouped/trunk/t/accessors_xs_cachedwarn.t
Log:
Plant a better diagnostic for when the xs shim cached detection fails

Modified: Class-Accessor-Grouped/trunk/lib/Class/Accessor/Grouped.pm
===================================================================
--- Class-Accessor-Grouped/trunk/lib/Class/Accessor/Grouped.pm	2010-12-12 03:17:26 UTC (rev 9809)
+++ Class-Accessor-Grouped/trunk/lib/Class/Accessor/Grouped.pm	2010-12-16 09:28:47 UTC (rev 9810)
@@ -546,7 +546,7 @@
   *__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 }
   ;

Modified: Class-Accessor-Grouped/trunk/t/accessors_xs_cachedwarn.t
===================================================================
--- Class-Accessor-Grouped/trunk/t/accessors_xs_cachedwarn.t	2010-12-12 03:17:26 UTC (rev 9809)
+++ Class-Accessor-Grouped/trunk/t/accessors_xs_cachedwarn.t	2010-12-16 09:28:47 UTC (rev 9810)
@@ -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 @@
   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;