1 |
commit: 549542cf21eb81eb75ce4f526f6a0da92b686c26 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 15:24:07 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 15:24:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549542cf |
7 |
|
8 |
dev-libs/glib: fix potential issues in network-monitor-race test |
9 |
|
10 |
Closes: https://bugs.gentoo.org/664106 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.11 |
13 |
|
14 |
...56.2-network-monitor-race-test-iterations.patch | 36 ++++++++++++++++++++++ |
15 |
dev-libs/glib/glib-2.56.2.ebuild | 3 ++ |
16 |
2 files changed, 39 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..1ddec6db946 |
21 |
--- /dev/null |
22 |
+++ b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch |
23 |
@@ -0,0 +1,36 @@ |
24 |
+From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001 |
25 |
+From: Philip Withnall <withnall@××××××××.com> |
26 |
+Date: Wed, 11 Apr 2018 15:45:10 +0100 |
27 |
+Subject: [PATCH] tests: Lower number of iterations in network-monitor-race |
28 |
+ |
29 |
+While 333 runs is very likely to reproduce the bug, Milan has previously |
30 |
+reproduced it with as few as 9 runs. Since this test will be run by the |
31 |
+CI machinery quite often, a lower number of runs each CI run will still |
32 |
+probably catch any regressions over time. |
33 |
+ |
34 |
+This reduces the total test runtime from 33s to 2s. |
35 |
+ |
36 |
+https://bugzilla.gnome.org/show_bug.cgi?id=793727 |
37 |
+ |
38 |
+Signed-off-by: Philip Withnall <withnall@××××××××.com> |
39 |
+Reviewed-by: nobody |
40 |
+--- |
41 |
+ gio/tests/network-monitor-race.c | 2 +- |
42 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
43 |
+ |
44 |
+diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c |
45 |
+index 4b92c87a5..cadd62cee 100644 |
46 |
+--- a/gio/tests/network-monitor-race.c |
47 |
++++ b/gio/tests/network-monitor-race.c |
48 |
+@@ -18,7 +18,7 @@ |
49 |
+ #include <glib/glib.h> |
50 |
+ #include <gio/gio.h> |
51 |
+ |
52 |
+-#define MAX_RUNS 333 |
53 |
++#define MAX_RUNS 20 |
54 |
+ |
55 |
+ static gboolean |
56 |
+ quit_loop (gpointer user_data) |
57 |
+-- |
58 |
+2.17.0 |
59 |
+ |
60 |
|
61 |
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild |
62 |
index d8adde6c4e2..ea796fb9470 100644 |
63 |
--- a/dev-libs/glib/glib-2.56.2.ebuild |
64 |
+++ b/dev-libs/glib/glib-2.56.2.ebuild |
65 |
@@ -115,6 +115,9 @@ src_prepare() { |
66 |
sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
67 |
fi |
68 |
|
69 |
+ # Less max runs in network monitor race test to avoid hitting timeout limits |
70 |
+ eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1 |
71 |
+ |
72 |
# gdbus-codegen is a separate package |
73 |
eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |