1 |
commit: b1b117a727197875e43711d269f8f1ba042aa690 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 20 21:31:52 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 20 21:32:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b117a7 |
7 |
|
8 |
dev-perl/Event-RPC: Fix tests for dot-in-inc bug #615834 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/615834 |
11 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
12 |
|
13 |
dev-perl/Event-RPC/Event-RPC-1.80.0.ebuild | 3 +- |
14 |
.../files/Event-RPC-1.80.0-no-dot-inc.patch | 203 +++++++++++++++++++++ |
15 |
2 files changed, 205 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-perl/Event-RPC/Event-RPC-1.80.0.ebuild b/dev-perl/Event-RPC/Event-RPC-1.80.0.ebuild |
18 |
index a94c5818c9e..0dfa5ab83be 100644 |
19 |
--- a/dev-perl/Event-RPC/Event-RPC-1.80.0.ebuild |
20 |
+++ b/dev-perl/Event-RPC/Event-RPC-1.80.0.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Copyright 1999-2017 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=6 |
27 |
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND} |
28 |
# Before disabling test here again, please file a bug and help kentnl |
29 |
# track it down, so we can at least run some tests where its sensible. |
30 |
#SRC_TEST=skip |
31 |
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch") |
32 |
|
33 |
diff --git a/dev-perl/Event-RPC/files/Event-RPC-1.80.0-no-dot-inc.patch b/dev-perl/Event-RPC/files/Event-RPC-1.80.0-no-dot-inc.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..9db111d68ea |
36 |
--- /dev/null |
37 |
+++ b/dev-perl/Event-RPC/files/Event-RPC-1.80.0-no-dot-inc.patch |
38 |
@@ -0,0 +1,203 @@ |
39 |
+From d0ac39cd738065a8f157dade0da743fd2c80960b Mon Sep 17 00:00:00 2001 |
40 |
+From: Kent Fredric <kentnl@g.o> |
41 |
+Date: Sat, 21 Oct 2017 10:17:48 +1300 |
42 |
+Subject: Fix test failures without '.' in @INC on Perl 5.26 |
43 |
+ |
44 |
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121204 |
45 |
+Bug: https://bugs.gentoo.org/615834 |
46 |
+--- |
47 |
+ MANIFEST | 6 +++--- |
48 |
+ t/02.cnct.t | 3 ++- |
49 |
+ t/03.cnct-auth.t | 3 ++- |
50 |
+ t/04.cnct-auth-ssl-verifypeer-noca.t | 3 ++- |
51 |
+ t/04.cnct-auth-ssl-verifypeer-wrongca.t | 3 ++- |
52 |
+ t/04.cnct-auth-ssl-verifypeer.t | 3 ++- |
53 |
+ t/04.cnct-auth-ssl.t | 4 ++-- |
54 |
+ t/05.func.t | 3 ++- |
55 |
+ t/06.object2.t | 4 ++-- |
56 |
+ t/07.maxpacket.t | 4 ++-- |
57 |
+ t/08.msg_formats.t | 4 ++-- |
58 |
+ t/{ => lib}/Event_RPC_Test.pm | 0 |
59 |
+ t/{ => lib}/Event_RPC_Test2.pm | 0 |
60 |
+ t/{ => lib}/Event_RPC_Test_Server.pm | 0 |
61 |
+ 14 files changed, 23 insertions(+), 17 deletions(-) |
62 |
+ rename t/{ => lib}/Event_RPC_Test.pm (100%) |
63 |
+ rename t/{ => lib}/Event_RPC_Test2.pm (100%) |
64 |
+ rename t/{ => lib}/Event_RPC_Test_Server.pm (100%) |
65 |
+ |
66 |
+diff --git a/MANIFEST b/MANIFEST |
67 |
+index fa86a36..4c5f709 100644 |
68 |
+--- a/MANIFEST |
69 |
++++ b/MANIFEST |
70 |
+@@ -32,9 +32,9 @@ t/05.func.t |
71 |
+ t/06.object2.t |
72 |
+ t/07.maxpacket.t |
73 |
+ t/08.msg_formats.t |
74 |
+-t/Event_RPC_Test.pm |
75 |
+-t/Event_RPC_Test2.pm |
76 |
+-t/Event_RPC_Test_Server.pm |
77 |
++t/lib/Event_RPC_Test.pm |
78 |
++t/lib/Event_RPC_Test2.pm |
79 |
++t/lib/Event_RPC_Test_Server.pm |
80 |
+ t/ssl/ca.crt |
81 |
+ t/ssl/ca.key |
82 |
+ t/ssl/ca-wrong.crt |
83 |
+diff --git a/t/02.cnct.t b/t/02.cnct.t |
84 |
+index 3ed842c..c23aa06 100644 |
85 |
+--- a/t/02.cnct.t |
86 |
++++ b/t/02.cnct.t |
87 |
+@@ -16,7 +16,8 @@ if ( not $depend_modules ) { |
88 |
+ |
89 |
+ plan tests => 5; |
90 |
+ |
91 |
+-require "t/Event_RPC_Test_Server.pm"; |
92 |
++use lib 't/lib'; |
93 |
++require Event_RPC_Test_Server; |
94 |
+ my $PORT = Event_RPC_Test_Server->port; |
95 |
+ |
96 |
+ # load client class |
97 |
+diff --git a/t/03.cnct-auth.t b/t/03.cnct-auth.t |
98 |
+index 6f782f9..06cf939 100644 |
99 |
+--- a/t/03.cnct-auth.t |
100 |
++++ b/t/03.cnct-auth.t |
101 |
+@@ -15,7 +15,8 @@ if ( not $depend_modules ) { |
102 |
+ |
103 |
+ plan tests => 6; |
104 |
+ |
105 |
+-require "t/Event_RPC_Test_Server.pm"; |
106 |
++use lib 't/lib'; |
107 |
++require Event_RPC_Test_Server; |
108 |
+ my $PORT = Event_RPC_Test_Server->port; |
109 |
+ |
110 |
+ my $AUTH_USER = "foo"; |
111 |
+diff --git a/t/04.cnct-auth-ssl-verifypeer-noca.t b/t/04.cnct-auth-ssl-verifypeer-noca.t |
112 |
+index 0a2502e..bafafff 100644 |
113 |
+--- a/t/04.cnct-auth-ssl-verifypeer-noca.t |
114 |
++++ b/t/04.cnct-auth-ssl-verifypeer-noca.t |
115 |
+@@ -20,7 +20,8 @@ if ( $@ ) { |
116 |
+ |
117 |
+ plan tests => 4; |
118 |
+ |
119 |
+-require "t/Event_RPC_Test_Server.pm"; |
120 |
++use lib "t/lib"; |
121 |
++require Event_RPC_Test_Server; |
122 |
+ my $PORT = Event_RPC_Test_Server->port; |
123 |
+ |
124 |
+ my $AUTH_USER = "foo"; |
125 |
+diff --git a/t/04.cnct-auth-ssl-verifypeer-wrongca.t b/t/04.cnct-auth-ssl-verifypeer-wrongca.t |
126 |
+index 48d7bdf..e34265d 100644 |
127 |
+--- a/t/04.cnct-auth-ssl-verifypeer-wrongca.t |
128 |
++++ b/t/04.cnct-auth-ssl-verifypeer-wrongca.t |
129 |
+@@ -20,7 +20,8 @@ if ( $@ ) { |
130 |
+ |
131 |
+ plan tests => 5; |
132 |
+ |
133 |
+-require "t/Event_RPC_Test_Server.pm"; |
134 |
++use lib 't/lib'; |
135 |
++require Event_RPC_Test_Server; |
136 |
+ my $PORT = Event_RPC_Test_Server->port; |
137 |
+ |
138 |
+ my $AUTH_USER = "foo"; |
139 |
+diff --git a/t/04.cnct-auth-ssl-verifypeer.t b/t/04.cnct-auth-ssl-verifypeer.t |
140 |
+index 6dc7816..93bc077 100644 |
141 |
+--- a/t/04.cnct-auth-ssl-verifypeer.t |
142 |
++++ b/t/04.cnct-auth-ssl-verifypeer.t |
143 |
+@@ -20,7 +20,8 @@ if ( $@ ) { |
144 |
+ |
145 |
+ plan tests => 6; |
146 |
+ |
147 |
+-require "t/Event_RPC_Test_Server.pm"; |
148 |
++use lib 't/lib'; |
149 |
++require Event_RPC_Test_Server; |
150 |
+ my $PORT = Event_RPC_Test_Server->port; |
151 |
+ |
152 |
+ my $AUTH_USER = "foo"; |
153 |
+diff --git a/t/04.cnct-auth-ssl.t b/t/04.cnct-auth-ssl.t |
154 |
+index 2b1eda4..0d9528e 100644 |
155 |
+--- a/t/04.cnct-auth-ssl.t |
156 |
++++ b/t/04.cnct-auth-ssl.t |
157 |
+@@ -19,8 +19,8 @@ if ( $@ ) { |
158 |
+ } |
159 |
+ |
160 |
+ plan tests => 6; |
161 |
+- |
162 |
+-require "t/Event_RPC_Test_Server.pm"; |
163 |
++use lib 't/lib'; |
164 |
++require Event_RPC_Test_Server; |
165 |
+ my $PORT = Event_RPC_Test_Server->port; |
166 |
+ |
167 |
+ my $AUTH_USER = "foo"; |
168 |
+diff --git a/t/05.func.t b/t/05.func.t |
169 |
+index 88fbe28..bd095b1 100644 |
170 |
+--- a/t/05.func.t |
171 |
++++ b/t/05.func.t |
172 |
+@@ -14,7 +14,8 @@ if ( not $depend_modules ) { |
173 |
+ |
174 |
+ plan tests => 18; |
175 |
+ |
176 |
+-require "t/Event_RPC_Test_Server.pm"; |
177 |
++use lib 't/lib'; |
178 |
++require Event_RPC_Test_Server; |
179 |
+ my $PORT = Event_RPC_Test_Server->port; |
180 |
+ |
181 |
+ # load client class |
182 |
+diff --git a/t/06.object2.t b/t/06.object2.t |
183 |
+index 62fcaca..7475a9d 100644 |
184 |
+--- a/t/06.object2.t |
185 |
++++ b/t/06.object2.t |
186 |
+@@ -16,8 +16,8 @@ if ( not $depend_modules ) { |
187 |
+ } |
188 |
+ |
189 |
+ plan tests => 10; |
190 |
+- |
191 |
+-require "t/Event_RPC_Test_Server.pm"; |
192 |
++use lib 't/lib'; |
193 |
++require Event_RPC_Test_Server; |
194 |
+ my $PORT = Event_RPC_Test_Server->port; |
195 |
+ |
196 |
+ # load client class |
197 |
+diff --git a/t/07.maxpacket.t b/t/07.maxpacket.t |
198 |
+index 88f8893..4b4e5e4 100644 |
199 |
+--- a/t/07.maxpacket.t |
200 |
++++ b/t/07.maxpacket.t |
201 |
+@@ -14,8 +14,8 @@ if ( not $depend_modules ) { |
202 |
+ } |
203 |
+ |
204 |
+ plan tests => 9; |
205 |
+- |
206 |
+-require "t/Event_RPC_Test_Server.pm"; |
207 |
++use lib 't/lib'; |
208 |
++require Event_RPC_Test_Server; |
209 |
+ my $PORT = Event_RPC_Test_Server->port; |
210 |
+ |
211 |
+ # load client class |
212 |
+diff --git a/t/08.msg_formats.t b/t/08.msg_formats.t |
213 |
+index f4a93c9..a875d8e 100644 |
214 |
+--- a/t/08.msg_formats.t |
215 |
++++ b/t/08.msg_formats.t |
216 |
+@@ -15,8 +15,8 @@ eval { require Glib } && ++$depend_modules; |
217 |
+ if ( not $depend_modules ) { |
218 |
+ plan skip_all => "Neither AnyEvent, Event nor Glib installed"; |
219 |
+ } |
220 |
+- |
221 |
+-require "t/Event_RPC_Test_Server.pm"; |
222 |
++use lib 't/lib'; |
223 |
++require Event_RPC_Test_Server; |
224 |
+ my $PORT = Event_RPC_Test_Server->port; |
225 |
+ |
226 |
+ # determine available message formats (including the insecure) |
227 |
+diff --git a/t/Event_RPC_Test.pm b/t/lib/Event_RPC_Test.pm |
228 |
+similarity index 100% |
229 |
+rename from t/Event_RPC_Test.pm |
230 |
+rename to t/lib/Event_RPC_Test.pm |
231 |
+diff --git a/t/Event_RPC_Test2.pm b/t/lib/Event_RPC_Test2.pm |
232 |
+similarity index 100% |
233 |
+rename from t/Event_RPC_Test2.pm |
234 |
+rename to t/lib/Event_RPC_Test2.pm |
235 |
+diff --git a/t/Event_RPC_Test_Server.pm b/t/lib/Event_RPC_Test_Server.pm |
236 |
+similarity index 100% |
237 |
+rename from t/Event_RPC_Test_Server.pm |
238 |
+rename to t/lib/Event_RPC_Test_Server.pm |
239 |
+-- |
240 |
+2.14.2 |
241 |
+ |