Attachment 916020 Details for Bug 1116795 – Patch resolving this issue

[patch] Patch resolving this issue

0001-Fixed-tests-timing-issues-on-s390-x.patch (text/plain), 3.81 KB, created by Jakub Čajka on 2014-07-07 10:28:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-07-07 10:28:49 UTC

Size: 3.81 KB

patch

obsolete

>From eaa9b30faf5993e5b226aaae4e574d8a52de5234 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Mon, 7 Jul 2014 11:27:02 +0200
>Subject: [PATCH] Fixed tests timing issues on s390(x)
>
>---
> testTiming.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
> zeromq3.spec     | 11 ++++++++++-
> 2 files changed, 61 insertions(+), 1 deletion(-)
> create mode 100644 testTiming.patch
>
>diff --git a/testTiming.patch b/testTiming.patch
>new file mode 100644
>index 0000000..5c4e6ec
>--- /dev/null
>+++ b/testTiming.patch
>@@ -0,0 +1,51 @@
>+diff -up zeromq-3.2.4/tests/test_connect_delay.cpp.s390 zeromq-3.2.4/tests/test_connect_delay.cpp
>+--- zeromq-3.2.4/tests/test_connect_delay.cpp.s390	2014-07-07 08:33:55.565472121 -0400
>++++ zeromq-3.2.4/tests/test_connect_delay.cpp	2014-07-07 08:34:13.195472121 -0400
>+@@ -201,7 +201,7 @@ int main (void)
>+     
>+     //  Give time to process disconnect
>+     //  There's no way to do this except with a sleep
>+-    struct timespec t = { 0, 250 * 1000000 };
>++    struct timespec t = { 5, 250 * 1000000 };
>+     nanosleep (&t, NULL);
>+     
>+     // Send a message, should fail
>+diff -up zeromq-3.2.4/tests/test_disconnect_inproc.cpp.s390 zeromq-3.2.4/tests/test_disconnect_inproc.cpp
>+--- zeromq-3.2.4/tests/test_disconnect_inproc.cpp.s390	2014-07-07 08:29:54.185472121 -0400
>++++ zeromq-3.2.4/tests/test_disconnect_inproc.cpp	2014-07-07 08:30:34.325472121 -0400
>+@@ -1,4 +1,5 @@
>+ #include <zmq.h>
>++#include "../include/zmq_utils.h"
>+ #include <inttypes.h>
>+ #include <string.h>
>+ #include <assert.h>
>+@@ -98,6 +99,8 @@ int main(int argc, char** argv) {
>+         zmq_sendmsg(pubSocket, &message, 0) >= 0 || printf("zmq_sendmsg: %s\n",zmq_strerror(errno));
>+         zmq_msg_close(&message) && printf("zmq_msg_close: %s\n",zmq_strerror(errno));
>+ 
>++	zmq_sleep(5);
>++
>+         iteration++;
>+     }
>+   
>+diff -up zeromq-3.2.4/tests/test_term_endpoint.cpp.s390 zeromq-3.2.4/tests/test_term_endpoint.cpp
>+--- zeromq-3.2.4/tests/test_term_endpoint.cpp.s390	2014-07-07 08:31:07.505472121 -0400
>++++ zeromq-3.2.4/tests/test_term_endpoint.cpp	2014-07-07 08:31:48.655472121 -0400
>+@@ -58,7 +58,7 @@ int main (void)
>+     assert (rc == 0);
>+ 
>+     // Let events some time
>+-    zmq_sleep (1);
>++    zmq_sleep (5);
>+ 
>+     //  Check that sending would block (there's no outbound connection).
>+     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);
>+@@ -100,7 +100,7 @@ int main (void)
>+     assert (rc == 0);
>+ 
>+     // Let events some time
>+-    zmq_sleep (1);
>++    zmq_sleep (5);
>+ 
>+     //  Check that sending would block (there's no inbound connections).
>+     rc = zmq_send (push, "ABC", 3, ZMQ_DONTWAIT);
>diff --git a/zeromq3.spec b/zeromq3.spec
>index 2ff1657..46b1a6f 100644
>--- a/zeromq3.spec
>+++ b/zeromq3.spec
>@@ -2,7 +2,7 @@
> 
> Name:           zeromq3
> Version:        3.2.4
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        Software library for fast, message-based applications
> 
> Group:          System Environment/Libraries
>@@ -24,6 +24,10 @@ URL:            http://www.zeromq.org
> # rc's
> Source0:        http://download.zeromq.org/zeromq-%{version}.tar.gz
> #####
>+
>+#Patch increses/introduces time delays in test to resolve timing issues on s390(x)
>+Patch0: testTiming.patch
>+
> BuildRequires:  glib2-devel
> BuildRequires:  libuuid-devel
> %if %{with pgm}
>@@ -57,6 +61,8 @@ developing applications that use %{name} 3.x.
> %prep
> %setup -qn zeromq-%{version}
> 
>+%patch0 -p1 -b .390
>+
> # remove all files in foreign except Makefiles
> rm -v $(find foreign -type f | grep -v Makefile)
> 
>@@ -104,6 +110,9 @@ make check
> 
> 
> %changelog
>+* Mon Jul 07 2014 Jakub Äajka <jcajka@redhat.com> - 3.2.4-3
>+- Fixed test timing issues on s390(x)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.4-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1116795: 916020