[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#926346: unblock: kronosnet/1.8-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package kronosnet

Dear Release Team,

The buildd setup got me again: the upload you kindly unblocked in
#926246 failed to build on all release architectures, because the
official buildds have module loading disabled, thus lack SCTP support,
and the changes introduced a new unit test which wasn't protected from
this yet.  I already uploaded a new revision 1.8-2 which adds a patch to
skip this new test if the SCTP protocol is not supported.  (The same
tests succeed on debci all right, BTW.)  I've blacklisted the sctp
module on my test machine to catch this problem next time.  For now,
please unblock 1.8-2; I provide the incremental debdiff below for ease
of review.

Thanks,
Feri.

diff -Nru kronosnet-1.8/debian/changelog kronosnet-1.8/debian/changelog
--- kronosnet-1.8/debian/changelog	2019-04-01 23:59:14.000000000 +0200
+++ kronosnet-1.8/debian/changelog	2019-04-03 10:33:30.000000000 +0200
@@ -1,3 +1,10 @@
+kronosnet (1.8-2) unstable; urgency=medium
+
+  * [b6a2cdc] New patch: send test: skip the SCTP test if SCTP is not supported
+    by the kernel
+
+ -- Ferenc Wágner <wferi@debian.org>  Wed, 03 Apr 2019 10:33:30 +0200
+
 kronosnet (1.8-1) unstable; urgency=medium
 
   * [ff7beff] New upstream release (1.8)
diff -Nru kronosnet-1.8/debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch kronosnet-1.8/debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch
--- kronosnet-1.8/debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch	1970-01-01 01:00:00.000000000 +0100
+++ kronosnet-1.8/debian/patches/send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch	2019-04-03 10:33:22.000000000 +0200
@@ -0,0 +1,28 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
+Date: Wed, 3 Apr 2019 10:26:11 +0200
+Subject: send test: skip the SCTP test if SCTP is not supported by the kernel
+
+For example, module loading is disabled on Debian build daemons.
+---
+ libknet/tests/api_knet_send.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libknet/tests/api_knet_send.c b/libknet/tests/api_knet_send.c
+index f241201..1c55db1 100644
+--- a/libknet/tests/api_knet_send.c
++++ b/libknet/tests/api_knet_send.c
+@@ -173,12 +173,13 @@ static void test(uint8_t transport)
+ 	}
+ 
+ 	if (knet_link_set_config(knet_h, 1, 0, transport, &lo, &lo, 0) < 0) {
++		int exit_status = transport == KNET_TRANSPORT_SCTP && errno == EPROTONOSUPPORT ? SKIP : FAIL;
+ 		printf("Unable to configure link: %s\n", strerror(errno));
+ 		knet_host_remove(knet_h, 1);
+ 		knet_handle_free(knet_h);
+ 		flush_logs(logfds[0], stdout);
+ 		close_logpipes(logfds);
+-		exit(FAIL);
++		exit(exit_status);
+ 	}
+ 
+ 	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
diff -Nru kronosnet-1.8/debian/patches/series kronosnet-1.8/debian/patches/series
--- kronosnet-1.8/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ kronosnet-1.8/debian/patches/series	2019-04-03 10:33:22.000000000 +0200
@@ -0,0 +1 @@
+send-test-skip-the-SCTP-test-if-SCTP-is-not-supported-by-.patch

unblock kronosnet/1.8-2

Reply to: