From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 28 Feb 2019 14:55:45 +0000 (+0100)
Subject: distro/rpm: disable failing test in contrib/test_net
X-Git-Tag: v2.8.0~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06bbea47bafa4f9a64caae6714774094d0ce2b95;p=thirdparty%2Fknot-dns.git

distro/rpm: disable failing test in contrib/test_net
---

diff --git a/distro/rpm/01-test_net-disable-udp-send-on-unconnected.patch b/distro/rpm/01-test_net-disable-udp-send-on-unconnected.patch
new file mode 100644
index 0000000000..ddacecae84
--- /dev/null
+++ b/distro/rpm/01-test_net-disable-udp-send-on-unconnected.patch
@@ -0,0 +1,27 @@
+commit 44b5e271a8564370efec3b9e95365aa039e0db61
+Author: Tomas Krizek <tomas.krizek@nic.cz>
+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 006b9b9d6..140659b3e 100644
+--- a/tests/contrib/test_net.c
++++ b/tests/contrib/test_net.c
+@@ -309,10 +309,6 @@ static void test_unconnected(void)
+ 	r = net_dgram_recv(sock, buffer, buffer_len, TIMEOUT_SHORT);
+ 	ok(r == KNOT_ETIMEOUT, "UDP, receive timeout on unconnected socket");
+ 
+-	struct sockaddr_storage server_addr = addr_from_socket(server);
+-	r = net_dgram_send(sock, buffer, buffer_len, (struct sockaddr *)&server_addr);
+-	ok(r == buffer_len, "UDP, send on defined address");
+-
+ 	close(sock);
+ 
+ 	// TCP
diff --git a/distro/rpm/knot.spec b/distro/rpm/knot.spec
index 51e5b27ee3..e8bddb656a 100644
--- a/distro/rpm/knot.spec
+++ b/distro/rpm/knot.spec
@@ -22,6 +22,9 @@ 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:	gcc
 BuildRequires:	pkgconfig(liburcu)
@@ -105,6 +108,7 @@ gpg2 --import %{SOURCE100}
 gpg2 --verify %{SOURCE1} %{SOURCE0}
 %endif
 %setup -q
+%patch1 -p1
 
 %build
 # disable debug code (causes unused warnings)