mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into gnome-team
Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191
This commit is contained in:
commit
e38d6a9c2f
195 changed files with 14271 additions and 50096 deletions
|
@ -808,22 +808,29 @@ ever use this library.")
|
|||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'check)
|
||||
(add-after 'install 'check
|
||||
(lambda _
|
||||
(setenv "HOME" (getenv "TMPDIR")) ;xfconfd requires a writable HOME
|
||||
;; Run test-suite under a dbus session.
|
||||
(setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
|
||||
(string-append #$output "/share:" (getenv "XDG_DATA_DIRS")))
|
||||
;; Don't fail on missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(with-directory-excursion (string-append "../at-spi2-core-"
|
||||
#$version "")
|
||||
(invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
|
||||
(substitute* "ci/run-tests.sh"
|
||||
(("ps auxwww") "") ;avoid a dependency on procps
|
||||
(("meson test -C _build")
|
||||
"meson test -C ../build")) ;adjust build directory
|
||||
(invoke "dbus-run-session" "--" "ci/run-tests.sh")))))))
|
||||
;; The CI test suite fails completely on powerpc-linux.
|
||||
;; The name org.gnome.SessionManager was not provided by any .service
|
||||
;; TODO: Wrap 'check phase with 'tests?'.
|
||||
#$@(if (not (target-ppc32?))
|
||||
#~((add-after 'install 'check
|
||||
(lambda _
|
||||
;; xfconfd requires a writable HOME
|
||||
(setenv "HOME" (getenv "TMPDIR"))
|
||||
;; Run test-suite under a dbus session.
|
||||
(setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
|
||||
(string-append #$output "/share:"
|
||||
(getenv "XDG_DATA_DIRS")))
|
||||
;; Don't fail on missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(with-directory-excursion (string-append "../at-spi2-core-"
|
||||
#$version "")
|
||||
(invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
|
||||
(substitute* "ci/run-tests.sh"
|
||||
(("ps auxwww") "") ;avoid a dependency on procps
|
||||
(("meson test -C _build")
|
||||
"meson test -C ../build")) ;adjust build directory
|
||||
(invoke "dbus-run-session" "--" "ci/run-tests.sh")))))
|
||||
#~()))))
|
||||
(inputs
|
||||
(list bash-minimal libxml2))
|
||||
(propagated-inputs
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue