me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Simplify "Xvbf" invocation in pre-check phases.

Browse source 
* 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:
Ludovic Courtès 2021-07-14 14:09:51 +02:00
parent 3bf9c3afc1
commit 07e98fb9c4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
9 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/education.scm
View file

@ -157,8 +157,7 @@ of categories with some of the activities available in that category.
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 &")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; The test suite wants to write to /homeless-shelter ;; The test suite wants to write to /homeless-shelter
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))

3
gnu/packages/freedesktop.scm
View file

@ -1134,8 +1134,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.")
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 &")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://wayland.freedesktop.org") (home-page "https://wayland.freedesktop.org")

3
gnu/packages/geo.scm
View file

@ -2138,8 +2138,7 @@ growing set of geoscientific methods.")
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 &")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
(setenv "TRAVIS" "true") (setenv "TRAVIS" "true")
(setenv "CTEST_OUTPUT_ON_FAILURE" "1") (setenv "CTEST_OUTPUT_ON_FAILURE" "1")

3
gnu/packages/graphics.scm
View file

@ -1708,8 +1708,7 @@ requirements.")
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 &")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(native-inputs (native-inputs

3
gnu/packages/java-graphics.scm
View file

@ -75,8 +75,7 @@ libraries.")
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 -screen 0 640x480x24 &")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(inputs (inputs

6
gnu/packages/kde-frameworks.scm
View file

@ -1641,8 +1641,7 @@ integrated it into your application's other widgets.")
;; Xvfb doesn't have proper glx support and needs a pixeldepth ;; Xvfb doesn't have proper glx support and needs a pixeldepth
;; of 24 bit to avoid "libGL error: failed to load driver: swrast" ;; of 24 bit to avoid "libGL error: failed to load driver: swrast"
;; "Could not initialize GLX" ;; "Could not initialize GLX"
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 -screen 0 640x480x24 &")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
@ -2386,8 +2385,7 @@ their settings.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server, setting ;; The test suite requires a running X server, setting
;; QT_QPA_PLATFORM=offscreen does not suffice. ;; QT_QPA_PLATFORM=offscreen does not suffice.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 -screen 0 640x480x24 &")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")

3
gnu/packages/kde-multimedia.scm
View file

@ -186,8 +186,7 @@ This package is part of the KDE multimedia module.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server, setting ;; The test suite requires a running X server, setting
;; QT_QPA_PLATFORM=offscreen does not suffice. ;; QT_QPA_PLATFORM=offscreen does not suffice.
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 -screen 0 640x480x24 &")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t)) #t))
(replace 'check (replace 'check

3
gnu/packages/kde-plasma.scm
View file

@ -154,8 +154,7 @@ call it if it is not associated to a terminal.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 -screen 0 640x480x24 &")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t)) #t))
(delete 'check) (delete 'check)

3
gnu/packages/radio.scm
View file

@ -579,8 +579,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(add-before 'check 'set-test-environment (add-before 'check 'set-test-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(system (string-append (assoc-ref inputs "xorg-server") (system "Xvfb :1 &")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t)) #t))
(replace 'check (replace 'check