[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
355/377: gnu: glib: Disable failing test.
From: |
guix-commits |
Subject: |
355/377: gnu: glib: Disable failing test. |
Date: |
Sun, 5 Sep 2021 10:08:30 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit dc7d35be7e7f83bf197373bb2c32b209d57ba6bc
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 211e429..abff9aa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1114,6 +1114,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 4659d13..5fb266c 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
+
- 325/377: gnu: wayland: Update synopsis, description and license., (continued)
- 325/377: gnu: wayland: Update synopsis, description and license., guix-commits, 2021/09/05
- 326/377: gnu: wayland-protocols: Update description., guix-commits, 2021/09/05
- 333/377: gnu: gtk+: Enable cloud-providers support., guix-commits, 2021/09/05
- 335/377: gnu: gtkmm: Update to 3.24.4., guix-commits, 2021/09/05
- 336/377: gnu: gtkmm-2: Fix build., guix-commits, 2021/09/05
- 338/377: gnu: ibus: Enable documentation., guix-commits, 2021/09/05
- 341/377: gnu: ibus: Remove trailing #t in phases., guix-commits, 2021/09/05
- 343/377: gnu: faac: Correct source uri., guix-commits, 2021/09/05
- 349/377: gnu: gst-plugins-ugly: Update to 1.18.4., guix-commits, 2021/09/05
- 354/377: gnu: cairo: Reintroduce security patches [security fixes]., guix-commits, 2021/09/05
- 355/377: gnu: glib: Disable failing test.,
guix-commits <=
- 356/377: gnu: meson-0.55: Update to 0.55.3., guix-commits, 2021/09/05
- 358/377: gnu: pango: Use meson-0.55, as required by the project., guix-commits, 2021/09/05
- 362/377: gnu: gnutls: Enable PKCS#11 support., guix-commits, 2021/09/05
- 366/377: gnu: gtkmm: Change build-system and adjust arguments accordingly., guix-commits, 2021/09/05
- 376/377: gnu: zbar: Rename qtbase to qtbase-5., guix-commits, 2021/09/05
- 295/377: gnu: gdk-pixbuf+svg: Correct package definition to include changes from gdk-pixbuf., guix-commits, 2021/09/05
- 319/377: gnu: at-spi2-atk: Update home-page and license., guix-commits, 2021/09/05
- 330/377: gnu: gtk+-2: Update to 2.24.33., guix-commits, 2021/09/05
- 310/377: gnu: atk: Update home-page and license., guix-commits, 2021/09/05
- 331/377: gnu: gtk+: Enable tests., guix-commits, 2021/09/05