From: Simon South <simon@simonsouth.net>
To: 43823@debbugs.gnu.org
Cc: me@tobias.gr, simon@simonsouth.net
Subject: [bug#43823] [PATCH v2 3/3] gnu: knot: Fix test failure on aarch64-linux.
Date: Tue, 6 Oct 2020 09:56:45 -0400 [thread overview]
Message-ID: <11f47227ef927f18f0c8d77a26173247360128d9.1601991615.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1601991615.git.simon@simonsouth.net>
* gnu/packages/dns.scm (knot)[source]: Apply patch from upstream that
helps ensure the "test_net_shortwrite" test suite can complete
regardless of platform or configuration.
* gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch:
New file.
* gnu/local.mk: Add it.
---
gnu/local.mk | 1 +
gnu/packages/dns.scm | 2 ++
...est_net_shortwrite-ensure-connection.patch | 19 +++++++++++++++++++
3 files changed, 22 insertions(+)
create mode 100644 gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 59cad38504..83d2d72ab1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1198,6 +1198,7 @@ dist_patch_DATA = \
%D%/packages/patches/kpackage-allow-external-paths.patch \
%D%/packages/patches/kmplayer-aarch64.patch \
%D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \
+ %D%/packages/patches/knot-test_net_shortwrite-ensure-connection.patch \
%D%/packages/patches/kobodeluxe-paths.patch \
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
%D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index b3dd68ccbd..97e919517c 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -815,6 +815,8 @@ Extensions} (DNSSEC).")
(file-name (git-file-name name version))
(sha256
(base32 "0fkvip7n5ihjfwnnivdc3jf44y8p85ifglvq7b0anxvj9cg1m78f"))
+ (patches
+ (search-patches "knot-test_net_shortwrite-ensure-connection.patch"))
(modules '((guix build utils)))
(snippet
'(begin
diff --git a/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
new file mode 100644
index 0000000000..9e86fbdb58
--- /dev/null
+++ b/gnu/packages/patches/knot-test_net_shortwrite-ensure-connection.patch
@@ -0,0 +1,19 @@
+This patch duplicates upstream commit 4144d1e, which helps ensure the
+"test_net_shortwrite" test suite can succeed across all platforms by
+deepening the pending-connection queue of the server it creates from 0
+to 1.
+
+See the original report at
+https://gitlab.nic.cz/knot/knot-dns/-/issues/693
+
+--- a/tests/contrib/test_net_shortwrite.c
++++ b/tests/contrib/test_net_shortwrite.c
+@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
+ int server = net_bound_socket(SOCK_STREAM, &addr, 0);
+ ok(server >= 0, "server: bind socket");
+
+- r = listen(server, 0);
++ r = listen(server, 1);
+ ok(r == 0, "server: start listening");
+
+ struct sockaddr *sa = (struct sockaddr *)&addr;
--
2.28.0
next prev parent reply other threads:[~2020-10-06 13:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 0:25 [bug#43823] [PATCH 0/3] Knot: Enable DoH; build Info manual; work on aarch64-linux Simon South
2020-10-06 0:27 ` [bug#43823] [PATCH 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig Simon South
2020-10-06 1:11 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 0:27 ` [bug#43823] [PATCH 2/3] gnu: knot: Build the Info manual Simon South
2020-10-06 1:10 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 0:27 ` [bug#43823] [PATCH 3/3] gnu: knot: Fix test failure on aarch64-linux Simon South
2020-10-06 1:15 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 1:08 ` [bug#43823] [PATCH 0/3] Knot: Enable DoH; build Info manual; work " Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 13:56 ` [bug#43823] [PATCH v2 0/3] Knot: Enable DoH; build Info Manual; " Simon South
2020-10-06 13:56 ` [bug#43823] [PATCH v2 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig Simon South
2020-10-06 13:56 ` [bug#43823] [PATCH v2 2/3] gnu: knot: Build the Info manual Simon South
2020-10-06 13:56 ` Simon South [this message]
2020-10-06 14:41 ` bug#43823: [PATCH v2 0/3] Knot: Enable DoH; build Info Manual; work on aarch64-linux Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 14:49 ` [bug#43823] " Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11f47227ef927f18f0c8d77a26173247360128d9.1601991615.git.simon@simonsouth.net \
--to=simon@simonsouth.net \
--cc=43823@debbugs.gnu.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).