From 3e6b398a48aacf15f605cff4d3f492505dc134a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 00:04:16 +0100 Subject: gnu: girara: Increase test timeouts. Fixes build failures on Hydra. Reported by Mark H Weaver in . * gnu/packages/gtk.scm (girara)[arguments]: Set CK_DEFAULT_TIMEOUT before running tests. --- gnu/packages/gtk.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 86dff08e40..c05d0734ef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1267,6 +1267,11 @@ write GNOME applications.") (let ((xorg-server (assoc-ref inputs "xorg-server")) (display ":1")) (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + ;; Don't fail due to missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") (zero? (system (string-append xorg-server "/bin/Xvfb " -- cgit 1.4.1 From 2416665ecbc931f9ed6da8d905b89da09e42ef24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 00:10:08 +0100 Subject: gnu: zathura, girara: Use the test-only xorg variant for tests. * gnu/packages/gtk.scm (girara)[native-inputs]: Replace XORG-SERVER with XORG-SERVER-1.19.3. [arguments]: Add #:disallowed-references. * gnu/packages/pdf.scm (zathura)[native-inputs, arguments]: Likewise. --- gnu/packages/gtk.scm | 3 ++- gnu/packages/pdf.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c05d0734ef..8b2b357c90 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1251,7 +1251,7 @@ write GNOME applications.") ("check" ,check) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-1.19.3))) ;; Listed in 'Requires.private' of 'girara.pc'. (propagated-inputs `(("gtk+" ,gtk+))) (arguments @@ -1259,6 +1259,7 @@ write GNOME applications.") `(,(string-append "PREFIX=" (assoc-ref %outputs "out")) "COLOR=0" "CC=gcc") #:test-target "test" + #:disallowed-references (,xorg-server-1.19.3) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'check 'start-xserver diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index aba7b974a8..2a447a9d89 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -498,7 +498,7 @@ by using the poppler rendering engine.") ;; For tests. ("check" ,check) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-1.19.3))) (inputs `(("sqlite" ,sqlite))) ;; Listed in 'Requires.private' of 'zathura.pc'. (propagated-inputs `(("cairo" ,cairo) @@ -513,6 +513,7 @@ by using the poppler rendering engine.") `(,(string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc" "COLOR=0") #:test-target "test" + #:disallowed-references (,xorg-server-1.19.3) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'check 'start-xserver -- cgit 1.4.1