1 From 9a7d82a8994505ad4c6552540d26c7586073e459 Mon Sep 17 00:00:00 2001
2 From: Kent Fredric <kentnl@gentoo.org>
3 Date: Sat, 7 Oct 2017 19:08:53 +1300
4 Subject: Fix test failures on Perl 5.26
6 This also replaces "do" with a stricter 'require' as that will properly
7 fail on nested errors instead of silently failing
9 Bug: https://rt.cpan.org/Ticket/Display.html?id=121132
10 Bug: https://bugs.gentoo.org/615582
13 t/box-scaling.t | 2 +-
14 t/box-showtable.t | 2 +-
18 t/html-scaling.t | 2 +-
19 t/html-showtable.t | 2 +-
20 t/html-widths.t | 2 +-
23 t/list-scaling.t | 2 +-
24 t/list-showtable.t | 2 +-
25 t/list-widths.t | 2 +-
27 t/simple-calls.t | 2 +-
28 t/simple-scaling.t | 2 +-
29 t/simple-showtable.t | 2 +-
30 t/simple-widths.t | 2 +-
31 t/simple-wrap.t | 2 +-
32 20 files changed, 20 insertions(+), 20 deletions(-)
34 diff --git a/t/box-calls.t b/t/box-calls.t
35 index 74a1ad9..ee6e26d 100755
38 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
39 unshift(@INC,'../blib/lib') if -d '../blib/lib';
40 unshift(@INC,'t') if -d 't';
43 +require "./$what.pl";
44 diff --git a/t/box-scaling.t b/t/box-scaling.t
45 index 74a1ad9..c95e2fd 100755
48 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
49 unshift(@INC,'../blib/lib') if -d '../blib/lib';
50 unshift(@INC,'t') if -d 't';
54 diff --git a/t/box-showtable.t b/t/box-showtable.t
55 index 74a1ad9..ee6e26d 100755
56 --- a/t/box-showtable.t
57 +++ b/t/box-showtable.t
58 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
59 unshift(@INC,'../blib/lib') if -d '../blib/lib';
60 unshift(@INC,'t') if -d 't';
63 +require "./$what.pl";
64 diff --git a/t/box-widths.t b/t/box-widths.t
65 index 74a1ad9..ee6e26d 100755
68 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
69 unshift(@INC,'../blib/lib') if -d '../blib/lib';
70 unshift(@INC,'t') if -d 't';
73 +require "./$what.pl";
74 diff --git a/t/box-wrap.t b/t/box-wrap.t
75 index 74a1ad9..ee6e26d 100755
78 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
79 unshift(@INC,'../blib/lib') if -d '../blib/lib';
80 unshift(@INC,'t') if -d 't';
83 +require "./$what.pl";
84 diff --git a/t/html-calls.t b/t/html-calls.t
85 index 74a1ad9..ee6e26d 100755
88 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
89 unshift(@INC,'../blib/lib') if -d '../blib/lib';
90 unshift(@INC,'t') if -d 't';
93 +require "./$what.pl";
94 diff --git a/t/html-scaling.t b/t/html-scaling.t
95 index 74a1ad9..ee6e26d 100755
96 --- a/t/html-scaling.t
97 +++ b/t/html-scaling.t
98 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
99 unshift(@INC,'../blib/lib') if -d '../blib/lib';
100 unshift(@INC,'t') if -d 't';
103 +require "./$what.pl";
104 diff --git a/t/html-showtable.t b/t/html-showtable.t
105 index 74a1ad9..ee6e26d 100755
106 --- a/t/html-showtable.t
107 +++ b/t/html-showtable.t
108 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
109 unshift(@INC,'../blib/lib') if -d '../blib/lib';
110 unshift(@INC,'t') if -d 't';
113 +require "./$what.pl";
114 diff --git a/t/html-widths.t b/t/html-widths.t
115 index 74a1ad9..ee6e26d 100755
116 --- a/t/html-widths.t
117 +++ b/t/html-widths.t
118 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
119 unshift(@INC,'../blib/lib') if -d '../blib/lib';
120 unshift(@INC,'t') if -d 't';
123 +require "./$what.pl";
124 diff --git a/t/html-wrap.t b/t/html-wrap.t
125 index 74a1ad9..ee6e26d 100755
128 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
129 unshift(@INC,'../blib/lib') if -d '../blib/lib';
130 unshift(@INC,'t') if -d 't';
133 +require "./$what.pl";
134 diff --git a/t/list-calls.t b/t/list-calls.t
135 index 74a1ad9..ee6e26d 100755
138 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
139 unshift(@INC,'../blib/lib') if -d '../blib/lib';
140 unshift(@INC,'t') if -d 't';
143 +require "./$what.pl";
144 diff --git a/t/list-scaling.t b/t/list-scaling.t
145 index 74a1ad9..ee6e26d 100755
146 --- a/t/list-scaling.t
147 +++ b/t/list-scaling.t
148 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
149 unshift(@INC,'../blib/lib') if -d '../blib/lib';
150 unshift(@INC,'t') if -d 't';
153 +require "./$what.pl";
154 diff --git a/t/list-showtable.t b/t/list-showtable.t
155 index 74a1ad9..ee6e26d 100755
156 --- a/t/list-showtable.t
157 +++ b/t/list-showtable.t
158 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
159 unshift(@INC,'../blib/lib') if -d '../blib/lib';
160 unshift(@INC,'t') if -d 't';
163 +require "./$what.pl";
164 diff --git a/t/list-widths.t b/t/list-widths.t
165 index 74a1ad9..ee6e26d 100755
166 --- a/t/list-widths.t
167 +++ b/t/list-widths.t
168 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
169 unshift(@INC,'../blib/lib') if -d '../blib/lib';
170 unshift(@INC,'t') if -d 't';
173 +require "./$what.pl";
174 diff --git a/t/list-wrap.t b/t/list-wrap.t
175 index 74a1ad9..ee6e26d 100755
178 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
179 unshift(@INC,'../blib/lib') if -d '../blib/lib';
180 unshift(@INC,'t') if -d 't';
183 +require "./$what.pl";
184 diff --git a/t/simple-calls.t b/t/simple-calls.t
185 index 74a1ad9..ee6e26d 100755
186 --- a/t/simple-calls.t
187 +++ b/t/simple-calls.t
188 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
189 unshift(@INC,'../blib/lib') if -d '../blib/lib';
190 unshift(@INC,'t') if -d 't';
193 +require "./$what.pl";
194 diff --git a/t/simple-scaling.t b/t/simple-scaling.t
195 index 74a1ad9..ee6e26d 100755
196 --- a/t/simple-scaling.t
197 +++ b/t/simple-scaling.t
198 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
199 unshift(@INC,'../blib/lib') if -d '../blib/lib';
200 unshift(@INC,'t') if -d 't';
203 +require "./$what.pl";
204 diff --git a/t/simple-showtable.t b/t/simple-showtable.t
205 index 74a1ad9..ee6e26d 100755
206 --- a/t/simple-showtable.t
207 +++ b/t/simple-showtable.t
208 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
209 unshift(@INC,'../blib/lib') if -d '../blib/lib';
210 unshift(@INC,'t') if -d 't';
213 +require "./$what.pl";
214 diff --git a/t/simple-widths.t b/t/simple-widths.t
215 index 74a1ad9..ee6e26d 100755
216 --- a/t/simple-widths.t
217 +++ b/t/simple-widths.t
218 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
219 unshift(@INC,'../blib/lib') if -d '../blib/lib';
220 unshift(@INC,'t') if -d 't';
223 +require "./$what.pl";
224 diff --git a/t/simple-wrap.t b/t/simple-wrap.t
225 index 74a1ad9..ee6e26d 100755
226 --- a/t/simple-wrap.t
227 +++ b/t/simple-wrap.t
228 @@ -25,4 +25,4 @@ $what = "t/$what" if -d "t" && !-r "$what.pl";
229 unshift(@INC,'../blib/lib') if -d '../blib/lib';
230 unshift(@INC,'t') if -d 't';
233 +require "./$what.pl";