branch core-updates-frozen updated: gnu: glib: Actually skip tests that fail on i686.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 5b674fe  gnu: glib: Actually skip tests that fail on i686.
5b674fe is described below

commit 5b674fe5c317425405075c0deab222cbaed80d83
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Sep 22 16:37:04 2021 +0200

    gnu: glib: Actually skip tests that fail on i686.
    
    * gnu/packages/glib.scm (glib)[arguments]: In 'disable-failing-tests'
    phase, when 'target-x86-32?' returns true, skip several tests in
    timer.c.
---
 gnu/packages/glib.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fd57041..6373fd0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -232,16 +232,15 @@ shared NFS home directories.")
                               "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
                  (("[ \t]*g_test_add_func.*;") "")))
 
-             ,@(if (let ((system (or (%current-target-system)
-                                     (%current-system))))
-                     (or (string-prefix? "i686-" system)
-                         (string-prefix? "i586-" system)))
-                   ;; Add the 'volatile' qualifier for doubles to avoid excess
-                   ;; precision, which leads to test failures:
+             ,@(if (target-x86-32?)
+                   ;; Comment out parts of timer.c that fail on i686 due to
+                   ;; excess precision when building with GCC 10:
                    ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
                    '((substitute* "glib/tests/timer.c"
-                       (("gdouble elapsed")
-                        "volatile gdouble elapsed")))
+                       (("^  g_assert_cmpuint \\(micros.*" all)
+                        (string-append "//" all "\n"))
+                       (("^  g_assert_cmpfloat \\(elapsed, ==.*" all)
+                        (string-append "//" all "\n"))))
                    '())
              #t))
          ;; Python references are not being patched in patch-phase of build,