1 |
commit: 92957d0a4e66217194d92beb864ef7b9f2c04cbb |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 8 03:34:55 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 8 03:34:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92957d0a |
7 |
|
8 |
net-libs/socket_wrapper: enable unit tests |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
.../socket_wrapper/files/1.2.4-tests-pid.patch | 47 ++++++++++++++++++++++ |
13 |
.../socket_wrapper/socket_wrapper-1.2.3.ebuild | 14 ++++++- |
14 |
2 files changed, 59 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch b/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..49aca70becd |
19 |
--- /dev/null |
20 |
+++ b/net-libs/socket_wrapper/files/1.2.4-tests-pid.patch |
21 |
@@ -0,0 +1,47 @@ |
22 |
+From a70e32fa9d60adde861618c91618a3be80f07c22 Mon Sep 17 00:00:00 2001 |
23 |
+From: Mike Gilbert <floppym@g.o> |
24 |
+Date: Thu, 7 May 2020 23:28:50 -0400 |
25 |
+Subject: [PATCH] tests: do not truncate pid to 16 bits |
26 |
+ |
27 |
+On Linux, pid_t is a 32-bit type, and the kernel permits pids up to 22 |
28 |
+bits in length. |
29 |
+ |
30 |
+Signed-off-by: Mike Gilbert <floppym@g.o> |
31 |
+--- |
32 |
+ tests/torture.c | 10 ++++------ |
33 |
+ 1 file changed, 4 insertions(+), 6 deletions(-) |
34 |
+ |
35 |
+diff --git a/tests/torture.c b/tests/torture.c |
36 |
+index e55ebcf..8524138 100644 |
37 |
+--- a/tests/torture.c |
38 |
++++ b/tests/torture.c |
39 |
+@@ -255,8 +255,7 @@ void torture_teardown_socket_dir(void **state) |
40 |
+ void torture_teardown_echo_srv(void **state) |
41 |
+ { |
42 |
+ struct torture_state *s = *state; |
43 |
+- char buf[8] = {0}; |
44 |
+- long int tmp; |
45 |
++ char buf[11] = {0}; |
46 |
+ ssize_t rc; |
47 |
+ pid_t pid; |
48 |
+ int fd; |
49 |
+@@ -277,13 +276,12 @@ void torture_teardown_echo_srv(void **state) |
50 |
+ |
51 |
+ buf[sizeof(buf) - 1] = '\0'; |
52 |
+ |
53 |
+- tmp = strtol(buf, NULL, 10); |
54 |
+- if (tmp == 0 || tmp > 0xFFFF || errno == ERANGE) { |
55 |
++ errno = 0; |
56 |
++ pid = strtol(buf, NULL, 10); |
57 |
++ if (pid == 0 || errno != 0) { |
58 |
+ goto done; |
59 |
+ } |
60 |
+ |
61 |
+- pid = (pid_t)(tmp & 0xFFFF); |
62 |
+- |
63 |
+ for (count = 0; count < 10; count++) { |
64 |
+ /* Make sure the daemon goes away! */ |
65 |
+ kill(pid, SIGTERM); |
66 |
+-- |
67 |
+2.26.2 |
68 |
+ |
69 |
|
70 |
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild |
71 |
index a34e9de9815..6f4bafee216 100644 |
72 |
--- a/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild |
73 |
+++ b/net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild |
74 |
@@ -14,5 +14,15 @@ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" |
75 |
IUSE="test" |
76 |
RESTRICT="!test? ( test )" |
77 |
|
78 |
-DEPEND="" |
79 |
-RDEPEND="${DEPEND}" |
80 |
+BDEPEND="test? ( >=dev-util/cmocka-1.1.0 )" |
81 |
+ |
82 |
+PATCHES=( |
83 |
+ "${FILESDIR}"/1.2.4-tests-pid.patch |
84 |
+) |
85 |
+ |
86 |
+src_configure() { |
87 |
+ local mycmakeargs=( |
88 |
+ -DUNIT_TESTING=$(usex test ON OFF) |
89 |
+ ) |
90 |
+ cmake-multilib_src_configure |
91 |
+} |