Merge pull request #369 from nnutter/master

fix bug when test_fail is called via a do statement (for 0.98 series)

lib/Test/Builder/Tester.pm

@@ -222,7 +222,7 @@ sub test_fail {
     $line = $line + ( shift() || 0 );    # prevent warnings
 
     # expect that on stderr
-    $err->expect("#     Failed test ($0 at line $line)");
+    $err->expect("#     Failed test ($filename at line $line)");
 }
 
 =item test_diag

t/Tester/tbt_09do.t

@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::Builder::Tester tests => 3;
+use Test::More;
+use File::Basename qw(dirname);
+use File::Spec qw();
+
+my $file = File::Spec->join(dirname(__FILE__), 'tbt_09do_script.pl');
+my $done = do $file;
+ok(defined($done), 'do succeeded') or do {
+    if ($@) {
+        diag qq(  \$@ is '$@'\n);
+    } elsif ($!) {
+        diag qq(  \$! is '$!'\n);
+    } else {
+        diag qq(  file's last statement returned undef: $file)
+    }
+};

t/Tester/tbt_09do_script.pl

@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+isnt($0, __FILE__, 'code is not executing directly');
+
+test_out("not ok 1 - one");
+test_fail(+1);
+ok(0,"one");
+test_test('test_fail caught fail message inside a do');
+
+1;