gnu: gtk: Guard against timeouts in the test suite.
This change piggy backs on the improvements to the meson-build-system made in dfcc96d8f48716ae5aefb383c58b153d5bcb407c; it's motivated by timeouts that occurred in the GTK test suite while building on a heavily loaded machine. * gnu/packages/gtk.scm (gtk)[parallel-tests]: New argument. [test-options]: New argument, which now includes --suite=gtk and --no-suite=gsk-compare-broadway, to match what upstream uses. [phases]{check}: Remove override.
This commit is contained in:
parent
58c42ce41d
commit
76df1ad3df
1 changed files with 6 additions and 7 deletions
|
@ -1116,6 +1116,12 @@ application suites.")
|
||||||
'("-Dgtk_doc=false")
|
'("-Dgtk_doc=false")
|
||||||
'("-Dgtk_doc=true"))
|
'("-Dgtk_doc=true"))
|
||||||
"-Dman-pages=true")
|
"-Dman-pages=true")
|
||||||
|
#:parallel-tests? #f ;parallel tests are not supported
|
||||||
|
#:test-options '("--setup=x11" ;defaults to wayland
|
||||||
|
;; Use the same test options as upstream uses for
|
||||||
|
;; their CI.
|
||||||
|
"--suite=gtk"
|
||||||
|
"--no-suite=gsk-compare-broadway")
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
|
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
|
||||||
|
@ -1154,13 +1160,6 @@ application suites.")
|
||||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||||
;; For missing '/etc/machine-id'.
|
;; For missing '/etc/machine-id'.
|
||||||
(setenv "DBUS_FATAL_WARNINGS" "0")))
|
(setenv "DBUS_FATAL_WARNINGS" "0")))
|
||||||
(replace 'check
|
|
||||||
(lambda* (#:key tests? #:allow-other-keys)
|
|
||||||
(when tests?
|
|
||||||
(setenv "MESON_TESTTHREADS" "1")
|
|
||||||
;; Run tests using the x11 setup,
|
|
||||||
;; instead of the default wayland.
|
|
||||||
(invoke "meson" "test" "--setup=x11"))))
|
|
||||||
(add-after 'install 'move-files
|
(add-after 'install 'move-files
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
|
Reference in a new issue