mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-25 20:19:18 -05:00
gnu: Simplify "Xvbf" invocation in pre-check phases.
* gnu/packages/geo.scm (qgis)[arguments]: Simplify invocation of 'Xvfb' in 'check' phase, assuming 'Xvfb' is in $PATH. * gnu/packages/graphics.scm (opensubdiv)[arguments]: Likewise. * gnu/packages/java-graphics.scm (java-piccolo2d-extras)[arguments]: Likewise. * gnu/packages/kde-frameworks.scm (kcontacts)[arguments]: Likewise. (kdeclarative)[arguments]: Likewise. * gnu/packages/kde-multimedia.scm (elisa)[arguments]: Likewise. * gnu/packages/kde-plasma.scm (kscreenlocker)[arguments]: Likewise. * gnu/packages/radio.scm (gnuradio)[arguments]: Likewise. * gnu/packages/education.scm (gcompris-qt)[arguments]: Likewise. * gnu/packages/freedesktop.scm (weston)[arguments]: Likewise.
This commit is contained in:
parent
3bf9c3afc1
commit
07e98fb9c4
9 changed files with 10 additions and 20 deletions
|
@ -157,8 +157,7 @@ (define-public gcompris-qt
|
|||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; The test suite wants to write to /homeless-shelter
|
||||
(setenv "HOME" (getcwd))
|
||||
|
|
|
@ -1134,8 +1134,7 @@ (define-public weston
|
|||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(home-page "https://wayland.freedesktop.org")
|
||||
|
|
|
@ -2138,8 +2138,7 @@ (define-public qgis
|
|||
(replace 'check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "HOME" "/tmp")
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
(setenv "TRAVIS" "true")
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
|
||||
|
|
|
@ -1708,8 +1708,7 @@ (define-public opensubdiv
|
|||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(native-inputs
|
||||
|
|
|
@ -75,8 +75,7 @@ (define-public java-piccolo2d-extras
|
|||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(system "Xvfb :1 -screen 0 640x480x24 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(inputs
|
||||
|
|
|
@ -1641,8 +1641,7 @@ (define-public kcontacts
|
|||
;; Xvfb doesn't have proper glx support and needs a pixeldepth
|
||||
;; of 24 bit to avoid "libGL error: failed to load driver: swrast"
|
||||
;; "Could not initialize GLX"
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(system "Xvfb :1 -screen 0 640x480x24 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
|
@ -2386,8 +2385,7 @@ (define-public kdeclarative
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server, setting
|
||||
;; QT_QPA_PLATFORM=offscreen does not suffice.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(system "Xvfb :1 -screen 0 640x480x24 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
|
|
|
@ -186,8 +186,7 @@ (define-public elisa
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; The test suite requires a running X server, setting
|
||||
;; QT_QPA_PLATFORM=offscreen does not suffice.
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(system "Xvfb :1 -screen 0 640x480x24 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t))
|
||||
(replace 'check
|
||||
|
|
|
@ -154,8 +154,7 @@ (define-public kscreenlocker
|
|||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
|
||||
(system "Xvfb :1 -screen 0 640x480x24 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t))
|
||||
(delete 'check)
|
||||
|
|
|
@ -579,8 +579,7 @@ (define-public gnuradio
|
|||
(add-before 'check 'set-test-environment
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "HOME" "/tmp")
|
||||
(system (string-append (assoc-ref inputs "xorg-server")
|
||||
"/bin/Xvfb :1 &"))
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
#t))
|
||||
(replace 'check
|
||||
|
|
Loading…
Reference in a new issue