diff options
| -rw-r--r-- | MANIFEST | 8 | ||||
| -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/caller/Apack.pm | 4 | ||||
| -rw-r--r-- | t/lib/caller/Bpack.pm | 4 | ||||
| -rw-r--r-- | t/lib/caller/Cpack.pm (renamed from t/lib/GH_15109/Cpack.pm) | 2 | ||||
| -rw-r--r-- | t/lib/caller/Foo.pm (renamed from t/lib/GH_15109/Foo.pm) | 0 | ||||
| -rw-r--r-- | t/op/caller.t | 6 |
8 files changed, 16 insertions, 16 deletions
@@ -5786,6 +5786,10 @@ t/io/tell.t See if file seeking works t/io/through.t See if pipe passes data intact t/io/utf8.t See if file seeking works t/japh/abigail.t Obscure tests +t/lib/caller/Apack.pm test Module for caller.t +t/lib/caller/Bpack.pm test Module for caller.t +t/lib/caller/Cpack.pm test Module for caller.t +t/lib/caller/Foo.pm test Module for caller.t t/lib/CannotParse.pm For test case in op/require_errors.t t/lib/charnames/alias Tests of "use charnames" with aliases. t/lib/Cname.pm Test charnames in regexes (op/pat.t) @@ -5825,10 +5829,6 @@ t/lib/feature/nonesuch Tests for enabling/disabling nonexistent feature t/lib/feature/removed Tests for enabling/disabling removed feature t/lib/feature/say Tests for enabling/disabling say feature t/lib/feature/switch Tests for enabling/disabling switch feature -t/lib/GH_15109/Apack.pm test Module for caller.t -t/lib/GH_15109/Bpack.pm test Module for caller.t -t/lib/GH_15109/Cpack.pm test Module for caller.t -t/lib/GH_15109/Foo.pm test Module for caller.t t/lib/h2ph.h Test header file for h2ph t/lib/h2ph.pht Generated output from h2ph.h by h2ph, for comparison t/lib/locale/latin1 Part of locale.t in Latin 1 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/caller/Apack.pm b/t/lib/caller/Apack.pm new file mode 100644 index 0000000000..597012102f --- /dev/null +++ b/t/lib/caller/Apack.pm @@ -0,0 +1,4 @@ +# for use by caller.t for GH #15109 and other tests +package Apack; +use Bpack; +1; diff --git a/t/lib/caller/Bpack.pm b/t/lib/caller/Bpack.pm new file mode 100644 index 0000000000..db0dca99ff --- /dev/null +++ b/t/lib/caller/Bpack.pm @@ -0,0 +1,4 @@ +# for use by caller.t for GH #15109 and other tests +package Bpack; +use Cpack; +1; diff --git a/t/lib/GH_15109/Cpack.pm b/t/lib/caller/Cpack.pm index 94c409b05c..86c422f24e 100644 --- a/t/lib/GH_15109/Cpack.pm +++ b/t/lib/caller/Cpack.pm @@ -1,4 +1,4 @@ -# for use by caller.t for GH #15109 +# for use by caller.t for GH #15109 and other tests package Cpack; diff --git a/t/lib/GH_15109/Foo.pm b/t/lib/caller/Foo.pm index 1af25470c6..1af25470c6 100644 --- a/t/lib/GH_15109/Foo.pm +++ b/t/lib/caller/Foo.pm diff --git a/t/op/caller.t b/t/op/caller.t index 00bb984dcb..7ae7fabab1 100644 --- a/t/op/caller.t +++ b/t/op/caller.t @@ -339,14 +339,14 @@ do './op/caller.pl' or die $@; # See that callers within a nested series of 'use's gets the right # filenames. { - local @INC = 'lib/GH_15109/'; + local @INC = 'lib/caller/'; # 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{caller/Bpack.pm:3}, "GH #15109 level $_") for 0..2; + like($Cpack::callers[$_], qr{caller/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; |