1 |
commit: f8761f86f769a47eb9091e4b85202a105f809f46 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 20 22:41:30 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 20 22:42:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8761f86 |
7 |
|
8 |
dev-perl/ExtUtils-XSpp: Fix tests without '.' in @INC bug #615240 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/615240 |
11 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
12 |
|
13 |
.../ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild | 4 +- |
14 |
.../ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild | 4 +- |
15 |
.../files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch | 314 +++++++++++++++++++ |
16 |
.../files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch | 344 +++++++++++++++++++++ |
17 |
4 files changed, 662 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild |
20 |
index fa3567ad6c6..c11abdc4a88 100644 |
21 |
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild |
22 |
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2015 Gentoo Foundation |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=5 |
29 |
@@ -23,5 +23,5 @@ DEPEND=" |
30 |
RDEPEND=" |
31 |
>=virtual/perl-ExtUtils-ParseXS-2.22.02 |
32 |
" |
33 |
- |
34 |
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" ) |
35 |
SRC_TEST=do |
36 |
|
37 |
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild |
38 |
index 115357c805a..730c1130cb2 100644 |
39 |
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild |
40 |
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild |
41 |
@@ -1,4 +1,4 @@ |
42 |
-# Copyright 1999-2015 Gentoo Foundation |
43 |
+# Copyright 1999-2017 Gentoo Foundation |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
|
46 |
EAPI=5 |
47 |
@@ -24,5 +24,5 @@ DEPEND="${RDEPEND} |
48 |
dev-perl/Test-Base |
49 |
) |
50 |
" |
51 |
- |
52 |
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" ) |
53 |
SRC_TEST="do parallel" |
54 |
|
55 |
diff --git a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch |
56 |
new file mode 100644 |
57 |
index 00000000000..f3a5120a4ef |
58 |
--- /dev/null |
59 |
+++ b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch |
60 |
@@ -0,0 +1,314 @@ |
61 |
+From 890c6563bca6c297500ed7ad6be7147e0222c797 Mon Sep 17 00:00:00 2001 |
62 |
+From: Kent Fredric <kentnl@g.o> |
63 |
+Date: Sat, 21 Oct 2017 11:04:37 +1300 |
64 |
+Subject: Fix test failures without '.' in @INC on 5.26+ |
65 |
+ |
66 |
+This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0 |
67 |
+set in the environment. |
68 |
+ |
69 |
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121070 |
70 |
+Bug: https://bugs.gentoo.org/615240 |
71 |
+Bug: https://github.com/mbarbon/extutils-xspp/pull/3 |
72 |
+--- |
73 |
+ t/010_base.t | 3 ++- |
74 |
+ t/011_multiple_files.t | 3 ++- |
75 |
+ t/012_preprocessor.t | 3 ++- |
76 |
+ t/015_reference.t | 3 ++- |
77 |
+ t/020_rename.t | 3 ++- |
78 |
+ t/022_static.t | 3 ++- |
79 |
+ t/022_virtual.t | 3 ++- |
80 |
+ t/023_base_classes.t | 3 ++- |
81 |
+ t/024_enum.t | 3 ++- |
82 |
+ t/030_code_blocks.t | 3 ++- |
83 |
+ t/031_verbatim_blocks.t | 3 ++- |
84 |
+ t/035_include.t | 3 ++- |
85 |
+ t/040_plugin.t | 7 ++++--- |
86 |
+ t/043_parser_plugins.t | 3 ++- |
87 |
+ t/075_types.t | 3 ++- |
88 |
+ t/080_complex_typemap.t | 3 ++- |
89 |
+ t/090_exceptions.t | 3 ++- |
90 |
+ t/lib/XSP/Plugin.pm | 2 +- |
91 |
+ t/lib/XSP/Test.pm | 4 ++-- |
92 |
+ 19 files changed, 39 insertions(+), 22 deletions(-) |
93 |
+ |
94 |
+diff --git a/t/010_base.t b/t/010_base.t |
95 |
+index 3d8b3c9..58cfd30 100644 |
96 |
+--- a/t/010_base.t |
97 |
++++ b/t/010_base.t |
98 |
+@@ -2,7 +2,8 @@ |
99 |
+ |
100 |
+ use strict; |
101 |
+ use warnings; |
102 |
+-use t::lib::XSP::Test tests => 14; |
103 |
++use lib 't/lib'; |
104 |
++use XSP::Test tests => 14; |
105 |
+ |
106 |
+ run_diff xsp_stdout => 'expected'; |
107 |
+ |
108 |
+diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t |
109 |
+index d52f930..d37d36b 100644 |
110 |
+--- a/t/011_multiple_files.t |
111 |
++++ b/t/011_multiple_files.t |
112 |
+@@ -2,7 +2,8 @@ |
113 |
+ |
114 |
+ use strict; |
115 |
+ use warnings; |
116 |
+-use t::lib::XSP::Test tests => 3; |
117 |
++use lib 't/lib'; |
118 |
++use XSP::Test tests => 3; |
119 |
+ |
120 |
+ run_diff process => 'expected'; |
121 |
+ |
122 |
+diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t |
123 |
+index 953bd73..7bf64f9 100644 |
124 |
+--- a/t/012_preprocessor.t |
125 |
++++ b/t/012_preprocessor.t |
126 |
+@@ -2,7 +2,8 @@ |
127 |
+ |
128 |
+ use strict; |
129 |
+ use warnings; |
130 |
+-use t::lib::XSP::Test tests => 6; |
131 |
++use lib 't/lib'; |
132 |
++use XSP::Test tests => 6; |
133 |
+ |
134 |
+ # monkeypatch print methods to test conditionals are parsed correctly |
135 |
+ no warnings 'redefine'; |
136 |
+diff --git a/t/015_reference.t b/t/015_reference.t |
137 |
+index e060a25..4b33887 100644 |
138 |
+--- a/t/015_reference.t |
139 |
++++ b/t/015_reference.t |
140 |
+@@ -2,7 +2,8 @@ |
141 |
+ |
142 |
+ use strict; |
143 |
+ use warnings; |
144 |
+-use t::lib::XSP::Test tests => 2; |
145 |
++use lib 't/lib'; |
146 |
++use XSP::Test tests => 2; |
147 |
+ |
148 |
+ run_diff xsp_stdout => 'expected'; |
149 |
+ |
150 |
+diff --git a/t/020_rename.t b/t/020_rename.t |
151 |
+index df6abc3..ec1a0fd 100644 |
152 |
+--- a/t/020_rename.t |
153 |
++++ b/t/020_rename.t |
154 |
+@@ -2,7 +2,8 @@ |
155 |
+ |
156 |
+ use strict; |
157 |
+ use warnings; |
158 |
+-use t::lib::XSP::Test tests => 9; |
159 |
++use lib 't/lib'; |
160 |
++use XSP::Test tests => 9; |
161 |
+ |
162 |
+ run_diff xsp_stdout => 'expected'; |
163 |
+ |
164 |
+diff --git a/t/022_static.t b/t/022_static.t |
165 |
+index de77672..138f02a 100644 |
166 |
+--- a/t/022_static.t |
167 |
++++ b/t/022_static.t |
168 |
+@@ -2,7 +2,8 @@ |
169 |
+ |
170 |
+ use strict; |
171 |
+ use warnings; |
172 |
+-use t::lib::XSP::Test tests => 1; |
173 |
++use lib 't/lib'; |
174 |
++use XSP::Test tests => 1; |
175 |
+ |
176 |
+ run_diff xsp_stdout => 'expected'; |
177 |
+ |
178 |
+diff --git a/t/022_virtual.t b/t/022_virtual.t |
179 |
+index 2186690..7434d53 100644 |
180 |
+--- a/t/022_virtual.t |
181 |
++++ b/t/022_virtual.t |
182 |
+@@ -2,7 +2,8 @@ |
183 |
+ |
184 |
+ use strict; |
185 |
+ use warnings; |
186 |
+-use t::lib::XSP::Test tests => 3; |
187 |
++use lib 't/lib'; |
188 |
++use XSP::Test tests => 3; |
189 |
+ |
190 |
+ run_diff xsp_stdout => 'expected'; |
191 |
+ |
192 |
+diff --git a/t/023_base_classes.t b/t/023_base_classes.t |
193 |
+index a53d5f8..00b2c06 100644 |
194 |
+--- a/t/023_base_classes.t |
195 |
++++ b/t/023_base_classes.t |
196 |
+@@ -2,7 +2,8 @@ |
197 |
+ |
198 |
+ use strict; |
199 |
+ use warnings; |
200 |
+-use t::lib::XSP::Test tests => 2; |
201 |
++use lib 't/lib'; |
202 |
++use XSP::Test tests => 2; |
203 |
+ |
204 |
+ run_diff xsp_stdout => 'expected'; |
205 |
+ |
206 |
+diff --git a/t/024_enum.t b/t/024_enum.t |
207 |
+index 30a88e0..6ca1edf 100644 |
208 |
+--- a/t/024_enum.t |
209 |
++++ b/t/024_enum.t |
210 |
+@@ -2,7 +2,8 @@ |
211 |
+ |
212 |
+ use strict; |
213 |
+ use warnings; |
214 |
+-use t::lib::XSP::Test tests => 2; |
215 |
++use lib 't/lib'; |
216 |
++use XSP::Test tests => 2; |
217 |
+ |
218 |
+ # monkeypatch Enum/EnumValue just to test that they were parsed correctly |
219 |
+ no warnings 'redefine'; |
220 |
+diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t |
221 |
+index dc6df69..aca157e 100644 |
222 |
+--- a/t/030_code_blocks.t |
223 |
++++ b/t/030_code_blocks.t |
224 |
+@@ -2,7 +2,8 @@ |
225 |
+ |
226 |
+ use strict; |
227 |
+ use warnings; |
228 |
+-use t::lib::XSP::Test tests => 6; |
229 |
++use lib 't/lib'; |
230 |
++use XSP::Test tests => 6; |
231 |
+ |
232 |
+ run_diff xsp_stdout => 'expected'; |
233 |
+ |
234 |
+diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t |
235 |
+index d123f66..5c2d373 100644 |
236 |
+--- a/t/031_verbatim_blocks.t |
237 |
++++ b/t/031_verbatim_blocks.t |
238 |
+@@ -2,7 +2,8 @@ |
239 |
+ |
240 |
+ use strict; |
241 |
+ use warnings; |
242 |
+-use t::lib::XSP::Test tests => 2; |
243 |
++use lib 't/lib'; |
244 |
++use XSP::Test tests => 2; |
245 |
+ |
246 |
+ run_diff xsp_stdout => 'expected'; |
247 |
+ |
248 |
+diff --git a/t/035_include.t b/t/035_include.t |
249 |
+index 4d5f4e5..306e183 100644 |
250 |
+--- a/t/035_include.t |
251 |
++++ b/t/035_include.t |
252 |
+@@ -2,7 +2,8 @@ |
253 |
+ |
254 |
+ use strict; |
255 |
+ use warnings; |
256 |
+-use t::lib::XSP::Test tests => 1; |
257 |
++use lib 't/lib'; |
258 |
++use XSP::Test tests => 1; |
259 |
+ |
260 |
+ run_diff xsp_stdout => 'expected'; |
261 |
+ |
262 |
+diff --git a/t/040_plugin.t b/t/040_plugin.t |
263 |
+index 798ba62..f8f1ea8 100644 |
264 |
+--- a/t/040_plugin.t |
265 |
++++ b/t/040_plugin.t |
266 |
+@@ -2,7 +2,8 @@ |
267 |
+ |
268 |
+ use strict; |
269 |
+ use warnings; |
270 |
+-use t::lib::XSP::Test tests => 2; |
271 |
++use lib 't/lib'; |
272 |
++use XSP::Test tests => 2; |
273 |
+ |
274 |
+ run_diff xsp_stdout => 'expected'; |
275 |
+ |
276 |
+@@ -12,8 +13,8 @@ __DATA__ |
277 |
+ --- xsp_stdout |
278 |
+ %module{Foo}; |
279 |
+ %package{Foo}; |
280 |
+-%loadplugin{t::lib::XSP::Plugin}; |
281 |
+-%loadplugin{t::lib::XSP::Plugin}; |
282 |
++%loadplugin{XSP::Plugin}; |
283 |
++%loadplugin{XSP::Plugin}; |
284 |
+ |
285 |
+ int foo(int y); |
286 |
+ |
287 |
+diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t |
288 |
+index e89c5cb..a84342b 100644 |
289 |
+--- a/t/043_parser_plugins.t |
290 |
++++ b/t/043_parser_plugins.t |
291 |
+@@ -2,7 +2,8 @@ |
292 |
+ |
293 |
+ use strict; |
294 |
+ use warnings; |
295 |
+-use t::lib::XSP::Test tests => 2; |
296 |
++use lib 't/lib'; |
297 |
++use XSP::Test tests => 2; |
298 |
+ |
299 |
+ run_diff xsp_stdout => 'expected'; |
300 |
+ |
301 |
+diff --git a/t/075_types.t b/t/075_types.t |
302 |
+index 441d66b..a4db077 100644 |
303 |
+--- a/t/075_types.t |
304 |
++++ b/t/075_types.t |
305 |
+@@ -2,7 +2,8 @@ |
306 |
+ |
307 |
+ use strict; |
308 |
+ use warnings; |
309 |
+-use t::lib::XSP::Test tests => 5; |
310 |
++use lib 't/lib'; |
311 |
++use XSP::Test tests => 5; |
312 |
+ |
313 |
+ run_diff xsp_stdout => 'expected'; |
314 |
+ |
315 |
+diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t |
316 |
+index f86df61..44314b2 100644 |
317 |
+--- a/t/080_complex_typemap.t |
318 |
++++ b/t/080_complex_typemap.t |
319 |
+@@ -2,7 +2,8 @@ |
320 |
+ |
321 |
+ use strict; |
322 |
+ use warnings; |
323 |
+-use t::lib::XSP::Test tests => 6; |
324 |
++use lib 't/lib'; |
325 |
++use XSP::Test tests => 6; |
326 |
+ |
327 |
+ run_diff xsp_stdout => 'expected'; |
328 |
+ |
329 |
+diff --git a/t/090_exceptions.t b/t/090_exceptions.t |
330 |
+index 0bb30fd..0e8071d 100644 |
331 |
+--- a/t/090_exceptions.t |
332 |
++++ b/t/090_exceptions.t |
333 |
+@@ -2,7 +2,8 @@ |
334 |
+ |
335 |
+ use strict; |
336 |
+ use warnings; |
337 |
+-use t::lib::XSP::Test tests => 9; |
338 |
++use lib 't/lib'; |
339 |
++use XSP::Test tests => 9; |
340 |
+ |
341 |
+ run_diff xsp_stdout => 'expected'; |
342 |
+ |
343 |
+diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm |
344 |
+index 8f0cd2a..e4b2212 100644 |
345 |
+--- a/t/lib/XSP/Plugin.pm |
346 |
++++ b/t/lib/XSP/Plugin.pm |
347 |
+@@ -1,4 +1,4 @@ |
348 |
+-package t::lib::XSP::Plugin; |
349 |
++package XSP::Plugin; |
350 |
+ |
351 |
+ use strict; |
352 |
+ use warnings; |
353 |
+diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm |
354 |
+index 719b829..081938f 100644 |
355 |
+--- a/t/lib/XSP/Test.pm |
356 |
++++ b/t/lib/XSP/Test.pm |
357 |
+@@ -1,4 +1,4 @@ |
358 |
+-package t::lib::XSP::Test; |
359 |
++package XSP::Test; |
360 |
+ |
361 |
+ use strict; |
362 |
+ use warnings; |
363 |
+@@ -37,7 +37,7 @@ sub run_diff(@) { |
364 |
+ |
365 |
+ use ExtUtils::XSpp; |
366 |
+ |
367 |
+-package t::lib::XSP::Test::Filter; |
368 |
++package XSP::Test::Filter; |
369 |
+ |
370 |
+ use Test::Base::Filter -base; |
371 |
+ |
372 |
+-- |
373 |
+2.14.2 |
374 |
+ |
375 |
|
376 |
diff --git a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch |
377 |
new file mode 100644 |
378 |
index 00000000000..1605f278b2d |
379 |
--- /dev/null |
380 |
+++ b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch |
381 |
@@ -0,0 +1,344 @@ |
382 |
+From 6875b61003a7a5e3d4c96ad12d74a02433baf9d7 Mon Sep 17 00:00:00 2001 |
383 |
+From: Kent Fredric <kentnl@g.o> |
384 |
+Date: Sat, 21 Oct 2017 11:04:37 +1300 |
385 |
+Subject: Fix test failures without '.' in @INC on 5.26+ |
386 |
+ |
387 |
+This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0 |
388 |
+set in the environment. |
389 |
+ |
390 |
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121070 |
391 |
+Bug: https://bugs.gentoo.org/615240 |
392 |
+Bug: https://github.com/mbarbon/extutils-xspp/pull/3 |
393 |
+--- |
394 |
+ t/010_base.t | 3 ++- |
395 |
+ t/011_multiple_files.t | 3 ++- |
396 |
+ t/012_preprocessor.t | 3 ++- |
397 |
+ t/013_typemap_output.t | 3 ++- |
398 |
+ t/015_reference.t | 3 ++- |
399 |
+ t/020_rename.t | 3 ++- |
400 |
+ t/022_static.t | 3 ++- |
401 |
+ t/022_virtual.t | 3 ++- |
402 |
+ t/023_base_classes.t | 3 ++- |
403 |
+ t/024_enum.t | 3 ++- |
404 |
+ t/025_member.t | 3 ++- |
405 |
+ t/030_code_blocks.t | 3 ++- |
406 |
+ t/031_verbatim_blocks.t | 3 ++- |
407 |
+ t/035_include.t | 3 ++- |
408 |
+ t/040_plugin.t | 7 ++++--- |
409 |
+ t/043_parser_plugins.t | 3 ++- |
410 |
+ t/075_types.t | 3 ++- |
411 |
+ t/080_complex_typemap.t | 3 ++- |
412 |
+ t/090_exceptions.t | 3 ++- |
413 |
+ t/lib/XSP/Plugin.pm | 2 +- |
414 |
+ t/lib/XSP/Test.pm | 4 ++-- |
415 |
+ 21 files changed, 43 insertions(+), 24 deletions(-) |
416 |
+ |
417 |
+diff --git a/t/010_base.t b/t/010_base.t |
418 |
+index 893857a..1c36dce 100644 |
419 |
+--- a/t/010_base.t |
420 |
++++ b/t/010_base.t |
421 |
+@@ -2,7 +2,8 @@ |
422 |
+ |
423 |
+ use strict; |
424 |
+ use warnings; |
425 |
+-use t::lib::XSP::Test tests => 14; |
426 |
++use lib 't/lib'; |
427 |
++use XSP::Test tests => 14; |
428 |
+ |
429 |
+ run_diff xsp_stdout => 'expected'; |
430 |
+ |
431 |
+diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t |
432 |
+index addf386..e4df4a5 100644 |
433 |
+--- a/t/011_multiple_files.t |
434 |
++++ b/t/011_multiple_files.t |
435 |
+@@ -2,7 +2,8 @@ |
436 |
+ |
437 |
+ use strict; |
438 |
+ use warnings; |
439 |
+-use t::lib::XSP::Test tests => 3; |
440 |
++use lib 't/lib'; |
441 |
++use XSP::Test tests => 3; |
442 |
+ |
443 |
+ run_diff process => 'expected'; |
444 |
+ |
445 |
+diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t |
446 |
+index 44e41a7..9a73626 100644 |
447 |
+--- a/t/012_preprocessor.t |
448 |
++++ b/t/012_preprocessor.t |
449 |
+@@ -2,7 +2,8 @@ |
450 |
+ |
451 |
+ use strict; |
452 |
+ use warnings; |
453 |
+-use t::lib::XSP::Test tests => 6; |
454 |
++use lib 't/lib'; |
455 |
++use XSP::Test tests => 6; |
456 |
+ |
457 |
+ # monkeypatch print methods to test conditionals are parsed correctly |
458 |
+ no warnings 'redefine'; |
459 |
+diff --git a/t/013_typemap_output.t b/t/013_typemap_output.t |
460 |
+index 6ed48bb..fb38f4a 100644 |
461 |
+--- a/t/013_typemap_output.t |
462 |
++++ b/t/013_typemap_output.t |
463 |
+@@ -2,7 +2,8 @@ |
464 |
+ |
465 |
+ use strict; |
466 |
+ use warnings; |
467 |
+-use t::lib::XSP::Test tests => 5; |
468 |
++use lib 't/lib'; |
469 |
++use XSP::Test tests => 5; |
470 |
+ |
471 |
+ use ExtUtils::XSpp; |
472 |
+ use ExtUtils::XSpp::Typemap::simple; |
473 |
+diff --git a/t/015_reference.t b/t/015_reference.t |
474 |
+index e3ade61..0728c16 100644 |
475 |
+--- a/t/015_reference.t |
476 |
++++ b/t/015_reference.t |
477 |
+@@ -2,7 +2,8 @@ |
478 |
+ |
479 |
+ use strict; |
480 |
+ use warnings; |
481 |
+-use t::lib::XSP::Test tests => 2; |
482 |
++use lib 't/lib'; |
483 |
++use XSP::Test tests => 2; |
484 |
+ |
485 |
+ run_diff xsp_stdout => 'expected'; |
486 |
+ |
487 |
+diff --git a/t/020_rename.t b/t/020_rename.t |
488 |
+index da55b07..7ecb125 100644 |
489 |
+--- a/t/020_rename.t |
490 |
++++ b/t/020_rename.t |
491 |
+@@ -2,7 +2,8 @@ |
492 |
+ |
493 |
+ use strict; |
494 |
+ use warnings; |
495 |
+-use t::lib::XSP::Test tests => 9; |
496 |
++use lib 't/lib'; |
497 |
++use XSP::Test tests => 9; |
498 |
+ |
499 |
+ run_diff xsp_stdout => 'expected'; |
500 |
+ |
501 |
+diff --git a/t/022_static.t b/t/022_static.t |
502 |
+index 857ca30..24c13ed 100644 |
503 |
+--- a/t/022_static.t |
504 |
++++ b/t/022_static.t |
505 |
+@@ -2,7 +2,8 @@ |
506 |
+ |
507 |
+ use strict; |
508 |
+ use warnings; |
509 |
+-use t::lib::XSP::Test tests => 1; |
510 |
++use lib 't/lib'; |
511 |
++use XSP::Test tests => 1; |
512 |
+ |
513 |
+ run_diff xsp_stdout => 'expected'; |
514 |
+ |
515 |
+diff --git a/t/022_virtual.t b/t/022_virtual.t |
516 |
+index b8d3a65..1dfdb3d 100644 |
517 |
+--- a/t/022_virtual.t |
518 |
++++ b/t/022_virtual.t |
519 |
+@@ -2,7 +2,8 @@ |
520 |
+ |
521 |
+ use strict; |
522 |
+ use warnings; |
523 |
+-use t::lib::XSP::Test tests => 3; |
524 |
++use lib 't/lib'; |
525 |
++use XSP::Test tests => 3; |
526 |
+ |
527 |
+ run_diff xsp_stdout => 'expected'; |
528 |
+ |
529 |
+diff --git a/t/023_base_classes.t b/t/023_base_classes.t |
530 |
+index 52b01be..a25aeb7 100644 |
531 |
+--- a/t/023_base_classes.t |
532 |
++++ b/t/023_base_classes.t |
533 |
+@@ -2,7 +2,8 @@ |
534 |
+ |
535 |
+ use strict; |
536 |
+ use warnings; |
537 |
+-use t::lib::XSP::Test tests => 2; |
538 |
++use lib 't/lib'; |
539 |
++use XSP::Test tests => 2; |
540 |
+ |
541 |
+ run_diff xsp_stdout => 'expected'; |
542 |
+ |
543 |
+diff --git a/t/024_enum.t b/t/024_enum.t |
544 |
+index 536d661..53c1774 100644 |
545 |
+--- a/t/024_enum.t |
546 |
++++ b/t/024_enum.t |
547 |
+@@ -2,7 +2,8 @@ |
548 |
+ |
549 |
+ use strict; |
550 |
+ use warnings; |
551 |
+-use t::lib::XSP::Test tests => 2; |
552 |
++use lib 't/lib'; |
553 |
++use XSP::Test tests => 2; |
554 |
+ |
555 |
+ # monkeypatch Enum/EnumValue just to test that they were parsed correctly |
556 |
+ no warnings 'redefine'; |
557 |
+diff --git a/t/025_member.t b/t/025_member.t |
558 |
+index c7f4fdc..ba1d8a3 100644 |
559 |
+--- a/t/025_member.t |
560 |
++++ b/t/025_member.t |
561 |
+@@ -2,7 +2,8 @@ |
562 |
+ |
563 |
+ use strict; |
564 |
+ use warnings; |
565 |
+-use t::lib::XSP::Test tests => 4; |
566 |
++use lib 't/lib'; |
567 |
++use XSP::Test tests => 4; |
568 |
+ |
569 |
+ run_diff xsp_stdout => 'expected'; |
570 |
+ |
571 |
+diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t |
572 |
+index 56cc97e..1f2f873 100644 |
573 |
+--- a/t/030_code_blocks.t |
574 |
++++ b/t/030_code_blocks.t |
575 |
+@@ -2,7 +2,8 @@ |
576 |
+ |
577 |
+ use strict; |
578 |
+ use warnings; |
579 |
+-use t::lib::XSP::Test tests => 6; |
580 |
++use lib 't/lib'; |
581 |
++use XSP::Test tests => 6; |
582 |
+ |
583 |
+ run_diff xsp_stdout => 'expected'; |
584 |
+ |
585 |
+diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t |
586 |
+index 68b66a7..1f3b6a7 100644 |
587 |
+--- a/t/031_verbatim_blocks.t |
588 |
++++ b/t/031_verbatim_blocks.t |
589 |
+@@ -2,7 +2,8 @@ |
590 |
+ |
591 |
+ use strict; |
592 |
+ use warnings; |
593 |
+-use t::lib::XSP::Test tests => 2; |
594 |
++use lib 't/lib'; |
595 |
++use XSP::Test tests => 2; |
596 |
+ |
597 |
+ run_diff xsp_stdout => 'expected'; |
598 |
+ |
599 |
+diff --git a/t/035_include.t b/t/035_include.t |
600 |
+index b52a25d..66de3e0 100644 |
601 |
+--- a/t/035_include.t |
602 |
++++ b/t/035_include.t |
603 |
+@@ -2,7 +2,8 @@ |
604 |
+ |
605 |
+ use strict; |
606 |
+ use warnings; |
607 |
+-use t::lib::XSP::Test tests => 1; |
608 |
++use lib 't/lib'; |
609 |
++use XSP::Test tests => 1; |
610 |
+ |
611 |
+ run_diff xsp_stdout => 'expected'; |
612 |
+ |
613 |
+diff --git a/t/040_plugin.t b/t/040_plugin.t |
614 |
+index dc3d975..680eda1 100644 |
615 |
+--- a/t/040_plugin.t |
616 |
++++ b/t/040_plugin.t |
617 |
+@@ -2,7 +2,8 @@ |
618 |
+ |
619 |
+ use strict; |
620 |
+ use warnings; |
621 |
+-use t::lib::XSP::Test tests => 2; |
622 |
++use lib 't/lib'; |
623 |
++use XSP::Test tests => 2; |
624 |
+ |
625 |
+ run_diff xsp_stdout => 'expected'; |
626 |
+ |
627 |
+@@ -12,8 +13,8 @@ __DATA__ |
628 |
+ --- xsp_stdout |
629 |
+ %module{Foo}; |
630 |
+ %package{Foo}; |
631 |
+-%loadplugin{t::lib::XSP::Plugin}; |
632 |
+-%loadplugin{t::lib::XSP::Plugin}; |
633 |
++%loadplugin{XSP::Plugin}; |
634 |
++%loadplugin{XSP::Plugin}; |
635 |
+ |
636 |
+ int foo(int y); |
637 |
+ |
638 |
+diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t |
639 |
+index 5d2a56e..9c11b1b 100644 |
640 |
+--- a/t/043_parser_plugins.t |
641 |
++++ b/t/043_parser_plugins.t |
642 |
+@@ -2,7 +2,8 @@ |
643 |
+ |
644 |
+ use strict; |
645 |
+ use warnings; |
646 |
+-use t::lib::XSP::Test tests => 4; |
647 |
++use lib 't/lib'; |
648 |
++use XSP::Test tests => 4; |
649 |
+ |
650 |
+ run_diff xsp_stdout => 'expected'; |
651 |
+ |
652 |
+diff --git a/t/075_types.t b/t/075_types.t |
653 |
+index 7616be2..b31de8d 100644 |
654 |
+--- a/t/075_types.t |
655 |
++++ b/t/075_types.t |
656 |
+@@ -2,7 +2,8 @@ |
657 |
+ |
658 |
+ use strict; |
659 |
+ use warnings; |
660 |
+-use t::lib::XSP::Test tests => 5; |
661 |
++use lib 't/lib'; |
662 |
++use XSP::Test tests => 5; |
663 |
+ |
664 |
+ run_diff xsp_stdout => 'expected'; |
665 |
+ |
666 |
+diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t |
667 |
+index 560f502..5e7c84b 100644 |
668 |
+--- a/t/080_complex_typemap.t |
669 |
++++ b/t/080_complex_typemap.t |
670 |
+@@ -2,7 +2,8 @@ |
671 |
+ |
672 |
+ use strict; |
673 |
+ use warnings; |
674 |
+-use t::lib::XSP::Test tests => 6; |
675 |
++use lib 't/lib'; |
676 |
++use XSP::Test tests => 6; |
677 |
+ |
678 |
+ run_diff xsp_stdout => 'expected'; |
679 |
+ |
680 |
+diff --git a/t/090_exceptions.t b/t/090_exceptions.t |
681 |
+index 0ad4f94..8043f61 100644 |
682 |
+--- a/t/090_exceptions.t |
683 |
++++ b/t/090_exceptions.t |
684 |
+@@ -2,7 +2,8 @@ |
685 |
+ |
686 |
+ use strict; |
687 |
+ use warnings; |
688 |
+-use t::lib::XSP::Test tests => 9; |
689 |
++use lib 't/lib'; |
690 |
++use XSP::Test tests => 9; |
691 |
+ |
692 |
+ run_diff xsp_stdout => 'expected'; |
693 |
+ |
694 |
+diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm |
695 |
+index 8f0cd2a..e4b2212 100644 |
696 |
+--- a/t/lib/XSP/Plugin.pm |
697 |
++++ b/t/lib/XSP/Plugin.pm |
698 |
+@@ -1,4 +1,4 @@ |
699 |
+-package t::lib::XSP::Plugin; |
700 |
++package XSP::Plugin; |
701 |
+ |
702 |
+ use strict; |
703 |
+ use warnings; |
704 |
+diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm |
705 |
+index 4bd7000..1d9f4bb 100644 |
706 |
+--- a/t/lib/XSP/Test.pm |
707 |
++++ b/t/lib/XSP/Test.pm |
708 |
+@@ -1,4 +1,4 @@ |
709 |
+-package t::lib::XSP::Test; |
710 |
++package XSP::Test; |
711 |
+ |
712 |
+ use strict; |
713 |
+ use warnings; |
714 |
+@@ -39,7 +39,7 @@ sub run_diff(@) { |
715 |
+ |
716 |
+ use ExtUtils::XSpp; |
717 |
+ |
718 |
+-package t::lib::XSP::Test::Filter; |
719 |
++package XSP::Test::Filter; |
720 |
+ |
721 |
+ use Test::Base::Filter -base; |
722 |
+ |
723 |
+-- |
724 |
+2.14.2 |
725 |
+ |