diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2018-11-29 17:24:07 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2018-11-29 17:24:41 +0200 |
| commit | 549542cf21eb81eb75ce4f526f6a0da92b686c26 (patch) | |
| tree | e7c9f337ad8dcfeb7587fbfa8c433fefc75a3ca3 /dev-libs | |
| parent | media-plugins/kodi-inputstream-adaptive: 2.3.12 version bump (diff) | |
| download | gentoo-549542cf21eb81eb75ce4f526f6a0da92b686c26.tar.gz gentoo-549542cf21eb81eb75ce4f526f6a0da92b686c26.tar.bz2 gentoo-549542cf21eb81eb75ce4f526f6a0da92b686c26.zip | |
dev-libs/glib: fix potential issues in network-monitor-race test
Closes: https://bugs.gentoo.org/664106
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch | 36 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.56.2.ebuild | 3 |
2 files changed, 39 insertions, 0 deletions
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 new file mode 100644 index 000000000000..1ddec6db9467 --- /dev/null +++ b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch @@ -0,0 +1,36 @@ +From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <withnall@endlessm.com> +Date: Wed, 11 Apr 2018 15:45:10 +0100 +Subject: [PATCH] tests: Lower number of iterations in network-monitor-race + +While 333 runs is very likely to reproduce the bug, Milan has previously +reproduced it with as few as 9 runs. Since this test will be run by the +CI machinery quite often, a lower number of runs each CI run will still +probably catch any regressions over time. + +This reduces the total test runtime from 33s to 2s. + +https://bugzilla.gnome.org/show_bug.cgi?id=793727 + +Signed-off-by: Philip Withnall <withnall@endlessm.com> +Reviewed-by: nobody +--- + gio/tests/network-monitor-race.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c +index 4b92c87a5..cadd62cee 100644 +--- a/gio/tests/network-monitor-race.c ++++ b/gio/tests/network-monitor-race.c +@@ -18,7 +18,7 @@ + #include <glib/glib.h> + #include <gio/gio.h> + +-#define MAX_RUNS 333 ++#define MAX_RUNS 20 + + static gboolean + quit_loop (gpointer user_data) +-- +2.17.0 + diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild index d8adde6c4e2a..ea796fb94700 100644 --- a/dev-libs/glib/glib-2.56.2.ebuild +++ b/dev-libs/glib/glib-2.56.2.ebuild @@ -115,6 +115,9 @@ src_prepare() { sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die fi + # Less max runs in network monitor race test to avoid hitting timeout limits + eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1 + # gdbus-codegen is a separate package eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |