diff options
author | David Mitchell <davem@iabyn.com> | 2020-04-27 21:54:16 +0100 |
---|---|---|
committer | David Mitchell <davem@iabyn.com> | 2020-04-27 21:54:16 +0100 |
commit | 79f75eaa716307235be78834c99ba0599a00319b (patch) | |
tree | 53aa9e331c8d42d3bc6f77774dd648e8a4e97136 /t | |
parent | d0b5de5644ac01ea2ccdbd8cbe7dd9c5fe225af4 (diff) | |
download | perl-79f75eaa716307235be78834c99ba0599a00319b.tar.gz |
Revert "avoid identical stack traces"
This reverts commit f2f32cd638746f538da6db804dab6dd54e654f30.
Diffstat (limited to 't')
-rw-r--r-- | t/lib/GH_15109/Apack.pm | 4 | ||||
-rw-r--r-- | t/lib/GH_15109/Bpack.pm | 4 | ||||
-rw-r--r-- | t/lib/GH_15109/Cpack.pm | 11 | ||||
-rw-r--r-- | t/op/caller.t | 19 |
4 files changed, 1 insertions, 37 deletions
diff --git a/t/lib/GH_15109/Apack.pm b/t/lib/GH_15109/Apack.pm deleted file mode 100644 index fa52ec8b53..0000000000 --- a/t/lib/GH_15109/Apack.pm +++ /dev/null @@ -1,4 +0,0 @@ -# for use by caller.t for GH #15109 -package Apack; -use Bpack; -1; diff --git a/t/lib/GH_15109/Bpack.pm b/t/lib/GH_15109/Bpack.pm deleted file mode 100644 index f9421c813f..0000000000 --- a/t/lib/GH_15109/Bpack.pm +++ /dev/null @@ -1,4 +0,0 @@ -# for use by caller.t for GH #15109 -package Bpack; -use Cpack; -1; diff --git a/t/lib/GH_15109/Cpack.pm b/t/lib/GH_15109/Cpack.pm deleted file mode 100644 index 94c409b05c..0000000000 --- a/t/lib/GH_15109/Cpack.pm +++ /dev/null @@ -1,11 +0,0 @@ -# for use by caller.t for GH #15109 -package Cpack; - - -my $i = 0; - -while (my ($package, $file, $line) = caller($i++)) { - push @Cpack::callers, "$file:$line"; -} - -1; diff --git a/t/op/caller.t b/t/op/caller.t index 9fc9a1ce39..564d140cc0 100644 --- a/t/op/caller.t +++ b/t/op/caller.t @@ -5,7 +5,7 @@ BEGIN { chdir 't' if -d 't'; require './test.pl'; set_up_inc('../lib'); - plan( tests => 109 ); # some tests are run in a BEGIN block + plan( tests => 97 ); # some tests are run in a BEGIN block } my @c; @@ -335,22 +335,6 @@ $::testing_caller = 1; do './op/caller.pl' or die $@; -# GH #15109 -# See that callers within a nested series of 'use's gets the right -# filenames. -{ - local @INC = 'lib/GH_15109/'; - # Apack use's Bpack which use's Cpack which populates @Cpack::caller - # with the file:N of all the callers - eval 'use Apack; 1'; - is($@, "", "GH #15109 - eval"); - is (scalar(@Cpack::callers), 10, "GH #15109 - callers count"); - like($Cpack::callers[$_], qr{GH_15109/Bpack.pm:3}, "GH #15109 level $_") for 0..2; - like($Cpack::callers[$_], qr{GH_15109/Apack.pm:3}, "GH #15109 level $_") for 3..5; - like($Cpack::callers[$_], qr{\(eval \d+\):1}, "GH #15109 level $_") for 6..8; - like($Cpack::callers[$_], qr{caller\.t}, "GH #15109 level $_") for 9; -} - { package RT129239; BEGIN { @@ -364,4 +348,3 @@ do './op/caller.pl' or die $@; #line 12345 "virtually/op/caller.t" } } - |