Merge pull request #401 from usev6/fix_test.pm

Report correct line numbers for failing tests
rakudo · Apr 2, 2015 · b4576d7 · b4576d7
2 parents 1457816 + 3a8ecbc
commit b4576d7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/Test.pm b/lib/Test.pm
@@ -461,9 +461,12 @@ sub proclaim($cond, $desc) {
       ~ "\n"
         if $perl6_test_times;
 
-    my $caller = callframe(3); # due to a bug in MoarVM, this callframe has to occur outside of the
-                               # unless block (see https://github.com/MoarVM/MoarVM/issues/120)
     unless $cond {
+        my $caller;
+        my $level = 3; # sub proclaim is not called directly, so 3 is minimum level
+        repeat until $caller.file ne $?FILE {
+            $caller = callframe($level++);
+        }
         if $desc ne '' {
             diag "\nFailed test '$desc'\nat {$caller.file} line {$caller.line}";
         } else {