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
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
|
From 6875b61003a7a5e3d4c96ad12d74a02433baf9d7 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/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
|
GitWeb