me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2021-09-22 16:37:04 +02:00
parent d58e52b071
commit 5b674fe5c3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/glib.scm
View File

@ -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,