Skip __LINE__ and __FILE__. Use __LINE__ in the tests

diff --git a/lib/subs/auto.pm b/lib/subs/auto.pm
index 13568acf02ac3419c0fb6222aa4b22c2cf50cedc..08f38e2c19fc138985a083a19fae69d98e5be3b1 100644 (file)
--- a/lib/subs/auto.pm
+++ b/lib/subs/auto.pm
@@ -78,7 +78,7 @@ my @core = qw/abs accept alarm atan2 bind binmode bless break caller chdir
               time times truncate uc ucfirst umask undef unlink unpack unshift
               untie use utime values vec wait waitpid wantarray warn when
               write/;
-push @core,qw/not/;
+push @core,qw/not __LINE__ __FILE__/;
 
 my %core;
 @core{@core} = ();

diff --git a/t/10-base.t b/t/10-base.t
index 70a898513d77e18f09fe9632d78cb21cb6ffc975..f3eaee68f99624b6ff6775fbfd218f40dc35219d 100644 (file)
--- a/t/10-base.t
+++ b/t/10-base.t
@@ -70,7 +70,7 @@ _got_ok('compiling to wut()');
 use subs::auto;
 
 eval { onlycalledonce 1, 2 };
-_got_undefined('onlycalledonce', 72);
+_got_undefined('onlycalledonce', __LINE__-1);
 
 eval { Test::More->import() };
 _got_ok('don\'t touch class names');
@@ -101,7 +101,7 @@ _got_ok('compiling to wut(13,"what")');
 is($wut, 17, 'wut really was executed');
 
 eval { qux };
-_got_undefined('qux', 103);
+_got_undefined('qux', __LINE__-1);
 
 {
  no strict 'refs';
@@ -117,10 +117,10 @@ _got_undefined('qux', 103);
 }
 
 eval { no warnings; no strict; qux };
-_got_undefined('qux', 119);
+_got_undefined('qux', __LINE__-1);
 
 eval { no warnings; no strict; blech };
-_got_undefined('blech', 122);
+_got_undefined('blech', __LINE__-1);
 
 sub foo {
  if ($_[2]) {
@@ -160,10 +160,10 @@ is($blech, 7, 'blech really was executed');
 is($warn, undef, 'no redefine warning');
 
 eval { qux };
-_got_undefined('qux', 162);
+_got_undefined('qux', __LINE__-1);
 
 eval { blech };
-_got_undefined('blech', 165);
+_got_undefined('blech', __LINE__-1);
 
 # === Up to there =============================================================
 no subs::auto;
@@ -224,7 +224,7 @@ _got_undefined('blech', 1, eval => 1);
 
 sub blech;
 eval { blech };
-_got_undefined('blech', 226);
+_got_undefined('blech', __LINE__-1);
 
 sub flop;