TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: cogl: Enable tests.

Browse source 
* gnu/packages/gnome.scm (cogl)[native-inputs]: Add XORG-SERVER-FOR-TESTS.
[arguments]: Remove #:tests?.  Add #:disallowed-references.  Add #:phases to
prepare test environment.
This commit is contained in:
Marius Bakke 2020-05-21 21:03:05 +02:00
parent 29f4bb2e91
commit b4f04e0eff
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/gnome.scm
View file

@ -4455,7 +4455,7 @@ (define-public cogl
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection)
;;("xorg-server" ,xorg-server) ; for the test suite
("xorg-server" ,xorg-server-for-tests)
("pkg-config" ,pkg-config)))
(propagated-inputs
`(("glib" ,glib)
@ -4474,7 +4474,8 @@ (define-public cogl
("gst-plugins-base" ,gst-plugins-base)
("wayland" ,wayland)))
(arguments
`(#:configure-flags (list "--enable-cogl-gst"
`(#:disallowed-references (,xorg-server-for-tests)
#:configure-flags (list "--enable-cogl-gst"
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
@ -4483,19 +4484,18 @@ (define-public cogl
(string-append "--with-gl-libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so"))
;; XXX FIXME: All tests fail, with many warnings printed like this:
;; _FontTransOpen: Unable to Parse address
;; ${prefix}/share/fonts/X11/misc/
#:tests? #f
#; #:phases
#;
#:phases
(modify-phases %standard-phases
(add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server.
(system (format #f "~a/bin/Xvfb :1 &"
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")
(lambda* (#:key tests? inputs #:allow-other-keys)
(if tests?
(begin
;; The test suite requires a running X server.
(system (format #f "~a/bin/Xvfb :1 +extension GLX &"
(assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1")
#t)
(format #t "test suite not run~%"))
#t)))))
(home-page "https://www.cogl3d.org")
(synopsis "Object oriented GL/GLES Abstraction/Utility Layer")