From be74444b69e0b1ea5228e9feb8f1c6ec3a5a9a73 Mon Sep 17 00:00:00 2001
From: Kent Fredric <kentnl@gentoo.org>
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
---
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/026_thx.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 ++--
22 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/t/010_base.t b/t/010_base.t
index 703c581..c2bee21 100644
--- a/t/010_base.t
+++ b/t/010_base.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t
index c36ec47..411ac3f 100644
--- a/t/011_multiple_files.t
+++ b/t/011_multiple_files.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff process => 'expected';
diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t
index 896ca7d..9a80586 100644
--- a/t/012_preprocessor.t
+++ b/t/012_preprocessor.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
# 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 721a6b5..ff96c44 100644
--- a/t/013_typemap_output.t
+++ b/t/013_typemap_output.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
use ExtUtils::XSpp;
use ExtUtils::XSpp::Typemap::simple;
diff --git a/t/015_reference.t b/t/015_reference.t
index d1eb409..75d52cf 100644
--- a/t/015_reference.t
+++ b/t/015_reference.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/020_rename.t b/t/020_rename.t
index 5d4cd66..7f62660 100644
--- a/t/020_rename.t
+++ b/t/020_rename.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/022_static.t b/t/022_static.t
index eae1c3e..40f8e7b 100644
--- a/t/022_static.t
+++ b/t/022_static.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/022_virtual.t b/t/022_virtual.t
index f94e75d..b8057c8 100644
--- a/t/022_virtual.t
+++ b/t/022_virtual.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/023_base_classes.t b/t/023_base_classes.t
index 3596c32..f9f52da 100644
--- a/t/023_base_classes.t
+++ b/t/023_base_classes.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/024_enum.t b/t/024_enum.t
index ef3880b..8932efc 100644
--- a/t/024_enum.t
+++ b/t/024_enum.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
# 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 14b838e..f93f92c 100644
--- a/t/025_member.t
+++ b/t/025_member.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/026_thx.t b/t/026_thx.t
index 8050e96..3a3f695 100644
--- a/t/026_thx.t
+++ b/t/026_thx.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t
index ce37086..295a649 100644
--- a/t/030_code_blocks.t
+++ b/t/030_code_blocks.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t
index 2a3fc99..9ed75f1 100644
--- a/t/031_verbatim_blocks.t
+++ b/t/031_verbatim_blocks.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/035_include.t b/t/035_include.t
index 226a523..1d33910 100644
--- a/t/035_include.t
+++ b/t/035_include.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/040_plugin.t b/t/040_plugin.t
index 1bf3210..f91083d 100644
--- a/t/040_plugin.t
+++ b/t/040_plugin.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
@@ -10,8 +11,8 @@ __DATA__
--- xsp_stdout
%module{XspTest};
%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 f072d8f..d4b01ed 100644
--- a/t/043_parser_plugins.t
+++ b/t/043_parser_plugins.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/075_types.t b/t/075_types.t
index ae34fc9..b43c9d8 100644
--- a/t/075_types.t
+++ b/t/075_types.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t
index 71033ab..d2ab2cc 100644
--- a/t/080_complex_typemap.t
+++ b/t/080_complex_typemap.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
run_diff xsp_stdout => 'expected';
diff --git a/t/090_exceptions.t b/t/090_exceptions.t
index 3926d51..e8705e5 100644
--- a/t/090_exceptions.t
+++ b/t/090_exceptions.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
-use t::lib::XSP::Test;
+use lib 't/lib';
+use XSP::Test;
with_exception_handling();
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 2aa79f7..5ac3674 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;
@@ -207,7 +207,7 @@ sub _munge_output($) {
use ExtUtils::XSpp;
-package t::lib::XSP::Test::Filter;
+package XSP::Test::Filter;
use Test::Base::Filter -base;
--
2.14.2
