mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: cogl: Enable tests.
* 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:
parent
29f4bb2e91
commit
b4f04e0eff
1 changed files with 13 additions and 13 deletions
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue