Work around test failures in t/64-uplevel-caller.t

This is probably related to the caller behaviour change re-re-introduced
with core commit f6387cf.

diff --git a/t/64-uplevel-caller.t b/t/64-uplevel-caller.t
index 50a44d7a63ad97170ee5d1263fd1e349020e3312..575ed3d52db494ed3ff3eb89f68d05fb49543b74 100644 (file)
--- a/t/64-uplevel-caller.t
+++ b/t/64-uplevel-caller.t
@@ -12,14 +12,18 @@ sub callstack {
  my $i = 1;
  my @stack;
  while (1) {
-  my @c = $check_args ? do { package DB; caller($i++) }
-                      : caller($i++);
+  my @c = $check_args ? do {
+   my $frame = ("$]" >= 5.037_010) ? ($i + 1) : $i;
+   package DB;
+   caller($frame)
+  } : caller($i);
   last unless @c;
   if ($check_args) {
    my $args = $c[4] ? [ @DB::args ] : undef;
    push @c, $args;
   }
   push @stack, \@c;
+  ++$i;
  }
  return \@stack;
 }