summaryrefslogtreecommitdiff
blob: 1364a89247eb2f5bb9e1d51ca009ac36d3771745 (plain)
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
345
346
347
348
349
350
351
352
353
354
355
From 6d397faa7006e0f3a67595d317e10d3bb81d8792 Mon Sep 17 00:00:00 2001
From: Kent Fredric <kentnl@gentoo.org>
Date: Sun, 22 Oct 2017 18:50:01 +1300
Subject: Fix tests failing on Perl 5.26 without '.' in @INC

eg: With PERL_USE_UNSAFE_INC=0 in ENV

This patch additionally creates safeguards against tests being allowed
to continue if the "do" call fails for any reason, as do does not
auto-fatalize, only warns at best.

Bug: https://rt.cpan.org/Ticket/Display.html?id=121440
Bug: https://bugs.gentoo.org/616954
---
 t/Gnome.t               | 4 +++-
 t/GnomeApp.t            | 4 +++-
 t/GnomeAppBar.t         | 4 +++-
 t/GnomeAppHelper.t      | 4 +++-
 t/GnomeColorPicker.t    | 4 +++-
 t/GnomeConfig.t         | 4 +++-
 t/GnomeDateEdit.t       | 4 +++-
 t/GnomeDruid.t          | 4 +++-
 t/GnomeEntry.t          | 4 +++-
 t/GnomeFileEntry.t      | 4 +++-
 t/GnomeFontPicker.t     | 4 +++-
 t/GnomeHRef.t           | 4 +++-
 t/GnomeIconEntry.t      | 4 +++-
 t/GnomeIconList.t       | 4 +++-
 t/GnomeIconSelection.t  | 4 +++-
 t/GnomeIconTheme.t      | 4 +++-
 t/GnomePasswordDialog.t | 4 +++-
 t/GnomePixmapEntry.t    | 4 +++-
 t/GnomePopupMenu.t      | 4 +++-
 t/GnomeScores.t         | 4 +++-
 t/GnomeThumbnail.t      | 4 +++-
 21 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/t/Gnome.t b/t/Gnome.t
index 8b6d0c5..e62b662 100644
--- a/t/Gnome.t
+++ b/t/Gnome.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeApp.t b/t/GnomeApp.t
index d7fc143..49420c3 100644
--- a/t/GnomeApp.t
+++ b/t/GnomeApp.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeAppBar.t b/t/GnomeAppBar.t
index 22ac53d..b127b2c 100644
--- a/t/GnomeAppBar.t
+++ b/t/GnomeAppBar.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeAppHelper.t b/t/GnomeAppHelper.t
index 849bfe7..5ed6350 100644
--- a/t/GnomeAppHelper.t
+++ b/t/GnomeAppHelper.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeColorPicker.t b/t/GnomeColorPicker.t
index 7f7fba9..8dcee3e 100644
--- a/t/GnomeColorPicker.t
+++ b/t/GnomeColorPicker.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeConfig.t b/t/GnomeConfig.t
index 2c42a14..24973be 100644
--- a/t/GnomeConfig.t
+++ b/t/GnomeConfig.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeDateEdit.t b/t/GnomeDateEdit.t
index a8f2e33..addd98d 100644
--- a/t/GnomeDateEdit.t
+++ b/t/GnomeDateEdit.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeDruid.t b/t/GnomeDruid.t
index c209004..21a9fdd 100644
--- a/t/GnomeDruid.t
+++ b/t/GnomeDruid.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeEntry.t b/t/GnomeEntry.t
index c2d2b68..a0aa95a 100644
--- a/t/GnomeEntry.t
+++ b/t/GnomeEntry.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeFileEntry.t b/t/GnomeFileEntry.t
index 91befa8..1d572a9 100644
--- a/t/GnomeFileEntry.t
+++ b/t/GnomeFileEntry.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeFontPicker.t b/t/GnomeFontPicker.t
index a2e8e68..98520db 100644
--- a/t/GnomeFontPicker.t
+++ b/t/GnomeFontPicker.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeHRef.t b/t/GnomeHRef.t
index 256347b..484fa61 100644
--- a/t/GnomeHRef.t
+++ b/t/GnomeHRef.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeIconEntry.t b/t/GnomeIconEntry.t
index 35ef1e6..957efc0 100644
--- a/t/GnomeIconEntry.t
+++ b/t/GnomeIconEntry.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeIconList.t b/t/GnomeIconList.t
index 2bf9eb1..8067a70 100644
--- a/t/GnomeIconList.t
+++ b/t/GnomeIconList.t
@@ -11,7 +11,9 @@ use Test::More skip_all => "Seems to be broken", tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeIconSelection.t b/t/GnomeIconSelection.t
index 35117c9..566ae85 100644
--- a/t/GnomeIconSelection.t
+++ b/t/GnomeIconSelection.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeIconTheme.t b/t/GnomeIconTheme.t
index 9baeb4c..dda3582 100644
--- a/t/GnomeIconTheme.t
+++ b/t/GnomeIconTheme.t
@@ -13,7 +13,9 @@ Gnome2::VFS -> init();
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   skip("GnomeIconTheme is new in 2.0.6", TESTS)
     unless (Gnome2 -> CHECK_VERSION(2, 0, 6));
diff --git a/t/GnomePasswordDialog.t b/t/GnomePasswordDialog.t
index 51c548c..38b2dcb 100644
--- a/t/GnomePasswordDialog.t
+++ b/t/GnomePasswordDialog.t
@@ -10,7 +10,9 @@ use Test::More tests => TESTS;
 ###############################################################################
 
 SKIP: {
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   skip("GnomePasswordDialog and GnomeAuthenticationManager didn't appear until 2.4.0", TESTS)
     unless (Gnome2 -> CHECK_VERSION(2, 4, 0));
diff --git a/t/GnomePixmapEntry.t b/t/GnomePixmapEntry.t
index 17e4996..dbfe42c 100644
--- a/t/GnomePixmapEntry.t
+++ b/t/GnomePixmapEntry.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomePopupMenu.t b/t/GnomePopupMenu.t
index 20275c9..151f410 100644
--- a/t/GnomePopupMenu.t
+++ b/t/GnomePopupMenu.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeScores.t b/t/GnomeScores.t
index 1b21ab2..82aa3a3 100644
--- a/t/GnomeScores.t
+++ b/t/GnomeScores.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   #############################################################################
 
diff --git a/t/GnomeThumbnail.t b/t/GnomeThumbnail.t
index ec0095f..ba24928 100644
--- a/t/GnomeThumbnail.t
+++ b/t/GnomeThumbnail.t
@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
 
 SKIP: {
   our $application;
-  do "t/TestBoilerplate";
+  do "./t/TestBoilerplate";
+  die $@ if $@;
+  die $! if $!;
 
   skip("GnomeThumbnail is new in 2.0.6", 4)
     unless (Gnome2 -> CHECK_VERSION(2, 0, 6));
-- 
2.14.2