From b7ade832fcaa119b09acabd53eae78a3a92be9d2 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Sat, 17 Dec 2022 13:50:33 +0100 Subject: [PATCH] distro: remove old patch on the test_net unit test --- .../01-disable-unconnected-net-test.patch | 1 - ...OG_CC.patch => 01-revert-AC_PROG_CC.patch} | 0 distro/pkg/el-7/knot.spec | 4 +-- ..._net-disable-udp-send-on-unconnected.patch | 26 ------------------- distro/pkg/rpm/knot.spec | 3 --- 5 files changed, 1 insertion(+), 33 deletions(-) delete mode 120000 distro/pkg/el-7/01-disable-unconnected-net-test.patch rename distro/pkg/el-7/{02-revert-AC_PROG_CC.patch => 01-revert-AC_PROG_CC.patch} (100%) delete mode 100644 distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch diff --git a/distro/pkg/el-7/01-disable-unconnected-net-test.patch b/distro/pkg/el-7/01-disable-unconnected-net-test.patch deleted file mode 120000 index 7672e6544..000000000 --- a/distro/pkg/el-7/01-disable-unconnected-net-test.patch +++ /dev/null @@ -1 +0,0 @@ -../rpm/01-test_net-disable-udp-send-on-unconnected.patch \ No newline at end of file diff --git a/distro/pkg/el-7/02-revert-AC_PROG_CC.patch b/distro/pkg/el-7/01-revert-AC_PROG_CC.patch similarity index 100% rename from distro/pkg/el-7/02-revert-AC_PROG_CC.patch rename to distro/pkg/el-7/01-revert-AC_PROG_CC.patch diff --git a/distro/pkg/el-7/knot.spec b/distro/pkg/el-7/knot.spec index b3953e2b9..0b1a3bfe0 100644 --- a/distro/pkg/el-7/knot.spec +++ b/distro/pkg/el-7/knot.spec @@ -22,9 +22,7 @@ Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc BuildRequires: gnupg2 %endif -# Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS -Patch1: 01-disable-unconnected-net-test.patch -Patch2: 02-revert-AC_PROG_CC.patch +Patch1: 01-revert-AC_PROG_CC.patch # Required dependencies BuildRequires: autoconf diff --git a/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch b/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch deleted file mode 100644 index f2b5b11b8..000000000 --- a/distro/pkg/rpm/01-test_net-disable-udp-send-on-unconnected.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Tomas Krizek -Date: 2019-02-28 14:26:56 +0100 - - test_net: disable UDP send on unconnected - - This test started to fail with 5.0 kernel in F30+ on aarch64 and s390x. - The functionality isn't used by Knot DNS, so disabling this test until - the issue is resolved should be safe. - - Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1675235 - -diff --git a/tests/contrib/test_net.c b/tests/contrib/test_net.c -index 0a22abbbc..6ec4bda31 100644 ---- a/tests/contrib/test_net.c -+++ b/tests/contrib/test_net.c -@@ -310,10 +310,6 @@ static void test_unconnected(void) - r = net_dgram_recv(sock, buffer, buffer_len, TIMEOUT_SHORT); - is_int(KNOT_ETIMEOUT, r, "UDP, receive timeout on unconnected socket"); - -- struct sockaddr_storage server_addr = addr_from_socket(server); -- r = net_dgram_send(sock, buffer, buffer_len, &server_addr); -- is_int(buffer_len, r, "UDP, send on defined address"); -- - close(sock); - - // TCP diff --git a/distro/pkg/rpm/knot.spec b/distro/pkg/rpm/knot.spec index 3800b305a..af06bc9f9 100644 --- a/distro/pkg/rpm/knot.spec +++ b/distro/pkg/rpm/knot.spec @@ -22,9 +22,6 @@ Source100: gpgkey-742FA4E95829B6C5EAC6B85710BB7AF6FEBBD6AB.gpg.asc BuildRequires: gnupg2 %endif -# Test fails on F30+ aarch/s390x for unknown reason, but it is not neccassary for Knot DNS -Patch1: 01-test_net-disable-udp-send-on-unconnected.patch - # Required dependencies BuildRequires: autoconf BuildRequires: automake