me
/
guix
Archived
1
0
Fork 0
Code

gnu: gdk-pixbuf: Only extend the test timeout on some architectures. 

* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Remove substitution
extending test timeout to 1800 seconds. Replace check on armhf-linux
and aarch64-linux to use 'timeout-multiplier' on the test suite.
master
Efraim Flashner 2018-12-12 12:22:29 +02:00
parent 83a40cbfd6
commit 56a88478b9
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/gtk.scm
View File

@ -76,7 +76,9 @@
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)) #:use-module (gnu packages xdisorg)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public atk (define-public atk
(package (package
@ -471,12 +473,15 @@ highlighting and other features typical of a source code editor.")
;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
;; assertion failed (error == NULL): Data differ ;; assertion failed (error == NULL): Data differ
;; (gdk-pixbuf-error-quark, 0) ;; (gdk-pixbuf-error-quark, 0)
((".*'pixbuf-jpeg'.*") "") ((".*'pixbuf-jpeg'.*") ""))
;; Extend the timeout of the test suite.
;; TODO: Check upstreaming effort:
;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/21
(("300") "1800"))
#t)) #t))
;; The slow tests take longer than the specified timeout.
,@(if (any (cute string=? <> (%current-system))
'("armhf-linux" "aarch64-linux"))
'((replace 'check
(lambda _
(invoke "meson" "test" "--timeout-multiplier" "5"))))
'())
(add-before 'configure 'aid-install-script (add-before 'configure 'aid-install-script
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders` ;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders`