[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
102/124: gnu: glib: Disable failing test.
From: |
guix-commits |
Subject: |
102/124: gnu: glib: Disable failing test. |
Date: |
Tue, 10 Aug 2021 20:21:25 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 9bd069a0bbf222be73c1c248cd74af6697b8d3d3
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 20 16:27:44 2021 +0300
gnu: glib: Disable failing test.
* gnu/packages/glib.scm (glib)[source]: Add patch.
[arguments]: Remove custom 'increase-test-timeout phase.
* gnu/packages/patches/glib-skip-failing-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/glib.scm | 14 ++----------
gnu/packages/patches/glib-skip-failing-test.patch | 27 +++++++++++++++++++++++
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 959b822..cb5f73d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1111,6 +1111,7 @@ dist_patch_DATA =
\
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/giara-fix-login.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
+ %D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-CVE-2018-11236.patch \
%D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index db5a436..d05ae9c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -186,7 +186,8 @@ shared NFS home directories.")
(sha256
(base32 "1sh3h6b734cxhdd1qlzvhxq6rc7k73dsisap5y3s419s9xc4ywv7"))
(patches
- (search-patches "glib-appinfo-watch.patch"))
+ (search-patches "glib-appinfo-watch.patch"
+ "glib-skip-failing-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -202,17 +203,6 @@ shared NFS home directories.")
#:configure-flags '("-Dman=true")
#:phases
(modify-phases %standard-phases
- ;; TODO: Remove the conditional in the next core-updates cycle.
- ;; Needed to build glib on slower ARM nodes.
- ,@(if (string-prefix? "arm" (%current-system))
- `((add-after 'unpack 'increase-test-timeout
- (lambda _
- (substitute* "meson.build"
- (("test_timeout = 60")
- "test_timeout = 90")
- (("test_timeout_slow = 120")
- "test_timeout_slow = 180")))))
- '())
(add-after 'unpack 'disable-failing-tests
(lambda _
(with-directory-excursion "glib/tests"
diff --git a/gnu/packages/patches/glib-skip-failing-test.patch
b/gnu/packages/patches/glib-skip-failing-test.patch
new file mode 100644
index 0000000..c7706aa
--- /dev/null
+++ b/gnu/packages/patches/glib-skip-failing-test.patch
@@ -0,0 +1,27 @@
+This test timed out on powerpc-linux even after extending the
+test_timeout_slow to 1800 seconds. Previously we tried to work around
+this test by extending test_timeout_slow by 1.5 its previous value.
+
+---
+ gio/tests/meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index a926ae0..4fdbe7a 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -317,10 +317,6 @@ if host_machine.system() != 'windows'
+ 'extra_sources' : [extra_sources, gdbus_test_codegen_generated,
gdbus_test_codegen_generated_interface_info],
+ 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'],
+ },
+- 'gdbus-threading' : {
+- 'extra_sources' : extra_sources,
+- 'suite' : ['slow'],
+- },
+ 'gmenumodel' : {
+ 'extra_sources' : extra_sources,
+ 'suite' : ['slow'],
+
+--
+2.31.1
+
- 114/124: gnu: gtkmm@2: Override inheritance of certain changes from gtkmm., (continued)
- 114/124: gnu: gtkmm@2: Override inheritance of certain changes from gtkmm., guix-commits, 2021/08/10
- 117/124: gnu: tracker: Enable some features., guix-commits, 2021/08/10
- 119/124: gnu: tracker: Update to 3.1.1 and make related changes., guix-commits, 2021/08/10
- 88/124: gnu: ibus: Remove trailing #t in phases., guix-commits, 2021/08/10
- 89/124: gnu: iqa: Correct source uri., guix-commits, 2021/08/10
- 87/124: gnu: ibus: Enable tests., guix-commits, 2021/08/10
- 92/124: gnu: gstreamer: Update to 1.18.4., guix-commits, 2021/08/10
- 94/124: gnu: gst-plugins-base: Enable more features., guix-commits, 2021/08/10
- 96/124: gnu: gst-plugins-ugly: Update to 1.18.4., guix-commits, 2021/08/10
- 97/124: gnu: gst-libav: Update to 1.18.4., guix-commits, 2021/08/10
- 102/124: gnu: glib: Disable failing test.,
guix-commits <=
- 105/124: gnu: pango: Use meson-0.55, as required by the project., guix-commits, 2021/08/10
- 108/124: gnu: glib-networking: Update home-page, synopsis, description and license., guix-commits, 2021/08/10
- 110/124: gnu: w3m: Update to 0.5.3+git20210102., guix-commits, 2021/08/10
- 113/124: gnu: gtkmm: Change build-system and adjust arguments accordingly., guix-commits, 2021/08/10
- 115/124: gnu: libsoup: Disable ssl-test., guix-commits, 2021/08/10
- 120/124: gnu: tracker: Propagate dependencies as per pkg-config file., guix-commits, 2021/08/10
- 121/124: gnu: tracker-miners: Update to 3.1.1 and make related changes., guix-commits, 2021/08/10
- 124/124: gnu: glib-networking: Disable openssl support., guix-commits, 2021/08/10
- 104/124: gnu: docbook-xsl: Update to 1.79.2., guix-commits, 2021/08/10
- 107/124: gnu: glib-networking: Enable libproxy and openssl support., guix-commits, 2021/08/10