1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
From 890c6563bca6c297500ed7ad6be7147e0222c797 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
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/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/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 ++--
19 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/t/010_base.t b/t/010_base.t
index 3d8b3c9..58cfd30 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 d52f930..d37d36b 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 953bd73..7bf64f9 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/015_reference.t b/t/015_reference.t
index e060a25..4b33887 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 df6abc3..ec1a0fd 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 de77672..138f02a 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 2186690..7434d53 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 a53d5f8..00b2c06 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 30a88e0..6ca1edf 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/030_code_blocks.t b/t/030_code_blocks.t
index dc6df69..aca157e 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 d123f66..5c2d373 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 4d5f4e5..306e183 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 798ba62..f8f1ea8 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 e89c5cb..a84342b 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 => 2;
+use lib 't/lib';
+use XSP::Test tests => 2;
run_diff xsp_stdout => 'expected';
diff --git a/t/075_types.t b/t/075_types.t
index 441d66b..a4db077 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 f86df61..44314b2 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 0bb30fd..0e8071d 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 719b829..081938f 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;
@@ -37,7 +37,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
|
