From 6875b61003a7a5e3d4c96ad12d74a02433baf9d7 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sat, 21 Oct 2017 11:04:37 +1300 Subject: Fix test failures without '.' in @INC on 5.26+ This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0 set in the environment. Bug: https://rt.cpan.org/Ticket/Display.html?id=121070 Bug: https://bugs.gentoo.org/615240 Bug: https://github.com/mbarbon/extutils-xspp/pull/3 --- t/010_base.t | 3 ++- t/011_multiple_files.t | 3 ++- t/012_preprocessor.t | 3 ++- t/013_typemap_output.t | 3 ++- t/015_reference.t | 3 ++- t/020_rename.t | 3 ++- t/022_static.t | 3 ++- t/022_virtual.t | 3 ++- t/023_base_classes.t | 3 ++- t/024_enum.t | 3 ++- t/025_member.t | 3 ++- t/030_code_blocks.t | 3 ++- t/031_verbatim_blocks.t | 3 ++- t/035_include.t | 3 ++- t/040_plugin.t | 7 ++++--- t/043_parser_plugins.t | 3 ++- t/075_types.t | 3 ++- t/080_complex_typemap.t | 3 ++- t/090_exceptions.t | 3 ++- t/lib/XSP/Plugin.pm | 2 +- t/lib/XSP/Test.pm | 4 ++-- 21 files changed, 43 insertions(+), 24 deletions(-) diff --git a/t/010_base.t b/t/010_base.t index 893857a..1c36dce 100644 --- a/t/010_base.t +++ b/t/010_base.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 14; +use lib 't/lib'; +use XSP::Test tests => 14; run_diff xsp_stdout => 'expected'; diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t index addf386..e4df4a5 100644 --- a/t/011_multiple_files.t +++ b/t/011_multiple_files.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 3; +use lib 't/lib'; +use XSP::Test tests => 3; run_diff process => 'expected'; diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t index 44e41a7..9a73626 100644 --- a/t/012_preprocessor.t +++ b/t/012_preprocessor.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 6; +use lib 't/lib'; +use XSP::Test tests => 6; # monkeypatch print methods to test conditionals are parsed correctly no warnings 'redefine'; diff --git a/t/013_typemap_output.t b/t/013_typemap_output.t index 6ed48bb..fb38f4a 100644 --- a/t/013_typemap_output.t +++ b/t/013_typemap_output.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 5; +use lib 't/lib'; +use XSP::Test tests => 5; use ExtUtils::XSpp; use ExtUtils::XSpp::Typemap::simple; diff --git a/t/015_reference.t b/t/015_reference.t index e3ade61..0728c16 100644 --- a/t/015_reference.t +++ b/t/015_reference.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 2; +use lib 't/lib'; +use XSP::Test tests => 2; run_diff xsp_stdout => 'expected'; diff --git a/t/020_rename.t b/t/020_rename.t index da55b07..7ecb125 100644 --- a/t/020_rename.t +++ b/t/020_rename.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 9; +use lib 't/lib'; +use XSP::Test tests => 9; run_diff xsp_stdout => 'expected'; diff --git a/t/022_static.t b/t/022_static.t index 857ca30..24c13ed 100644 --- a/t/022_static.t +++ b/t/022_static.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 1; +use lib 't/lib'; +use XSP::Test tests => 1; run_diff xsp_stdout => 'expected'; diff --git a/t/022_virtual.t b/t/022_virtual.t index b8d3a65..1dfdb3d 100644 --- a/t/022_virtual.t +++ b/t/022_virtual.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 3; +use lib 't/lib'; +use XSP::Test tests => 3; run_diff xsp_stdout => 'expected'; diff --git a/t/023_base_classes.t b/t/023_base_classes.t index 52b01be..a25aeb7 100644 --- a/t/023_base_classes.t +++ b/t/023_base_classes.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 2; +use lib 't/lib'; +use XSP::Test tests => 2; run_diff xsp_stdout => 'expected'; diff --git a/t/024_enum.t b/t/024_enum.t index 536d661..53c1774 100644 --- a/t/024_enum.t +++ b/t/024_enum.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 2; +use lib 't/lib'; +use XSP::Test tests => 2; # monkeypatch Enum/EnumValue just to test that they were parsed correctly no warnings 'redefine'; diff --git a/t/025_member.t b/t/025_member.t index c7f4fdc..ba1d8a3 100644 --- a/t/025_member.t +++ b/t/025_member.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 4; +use lib 't/lib'; +use XSP::Test tests => 4; run_diff xsp_stdout => 'expected'; diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t index 56cc97e..1f2f873 100644 --- a/t/030_code_blocks.t +++ b/t/030_code_blocks.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 6; +use lib 't/lib'; +use XSP::Test tests => 6; run_diff xsp_stdout => 'expected'; diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t index 68b66a7..1f3b6a7 100644 --- a/t/031_verbatim_blocks.t +++ b/t/031_verbatim_blocks.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 2; +use lib 't/lib'; +use XSP::Test tests => 2; run_diff xsp_stdout => 'expected'; diff --git a/t/035_include.t b/t/035_include.t index b52a25d..66de3e0 100644 --- a/t/035_include.t +++ b/t/035_include.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 1; +use lib 't/lib'; +use XSP::Test tests => 1; run_diff xsp_stdout => 'expected'; diff --git a/t/040_plugin.t b/t/040_plugin.t index dc3d975..680eda1 100644 --- a/t/040_plugin.t +++ b/t/040_plugin.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 2; +use lib 't/lib'; +use XSP::Test tests => 2; run_diff xsp_stdout => 'expected'; @@ -12,8 +13,8 @@ __DATA__ --- xsp_stdout %module{Foo}; %package{Foo}; -%loadplugin{t::lib::XSP::Plugin}; -%loadplugin{t::lib::XSP::Plugin}; +%loadplugin{XSP::Plugin}; +%loadplugin{XSP::Plugin}; int foo(int y); diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t index 5d2a56e..9c11b1b 100644 --- a/t/043_parser_plugins.t +++ b/t/043_parser_plugins.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 4; +use lib 't/lib'; +use XSP::Test tests => 4; run_diff xsp_stdout => 'expected'; diff --git a/t/075_types.t b/t/075_types.t index 7616be2..b31de8d 100644 --- a/t/075_types.t +++ b/t/075_types.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 5; +use lib 't/lib'; +use XSP::Test tests => 5; run_diff xsp_stdout => 'expected'; diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t index 560f502..5e7c84b 100644 --- a/t/080_complex_typemap.t +++ b/t/080_complex_typemap.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 6; +use lib 't/lib'; +use XSP::Test tests => 6; run_diff xsp_stdout => 'expected'; diff --git a/t/090_exceptions.t b/t/090_exceptions.t index 0ad4f94..8043f61 100644 --- a/t/090_exceptions.t +++ b/t/090_exceptions.t @@ -2,7 +2,8 @@ use strict; use warnings; -use t::lib::XSP::Test tests => 9; +use lib 't/lib'; +use XSP::Test tests => 9; run_diff xsp_stdout => 'expected'; diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm index 8f0cd2a..e4b2212 100644 --- a/t/lib/XSP/Plugin.pm +++ b/t/lib/XSP/Plugin.pm @@ -1,4 +1,4 @@ -package t::lib::XSP::Plugin; +package XSP::Plugin; use strict; use warnings; diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm index 4bd7000..1d9f4bb 100644 --- a/t/lib/XSP/Test.pm +++ b/t/lib/XSP/Test.pm @@ -1,4 +1,4 @@ -package t::lib::XSP::Test; +package XSP::Test; use strict; use warnings; @@ -39,7 +39,7 @@ sub run_diff(@) { use ExtUtils::XSpp; -package t::lib::XSP::Test::Filter; +package XSP::Test::Filter; use Test::Base::Filter -base; -- 2.14.2