diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-03 12:07:22 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:32 -0500 |
| commit | dfcc96d8f48716ae5aefb383c58b153d5bcb407c (patch) | |
| tree | bd78a84d83ef6be838bac8d2910087f6cef8ff8a /doc | |
| parent | 3e026fc2b1bd65ead774733fbc5852794d96bf43 (diff) | |
| download | guix-patches-dfcc96d8f48716ae5aefb383c58b153d5bcb407c.tar guix-patches-dfcc96d8f48716ae5aefb383c58b153d5bcb407c.tar.gz | |
build: meson: Replace the 'test-target' argument by 'test-options'.
This change is motivated by the need to disable the default 30 seconds timeout
that Meson uses (see: https://gitlab.gnome.org/GNOME/glib/-/issues/2522), and
also by desire to specify extra options to run the check phase without having
to override it.
* guix/build-system/meson.scm (meson-build) <test-target>: Replace argument
with...
<test-options>: ... this one.
* guix/build/meson-build-system.scm (check): Invoke 'meson test' instead of
'ninja test-target', as the former is configurable via options.
* doc/guix.texi (Build Systems) <meson-build-system>: Update doc.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 0234af41e1..d5290585e0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8746,8 +8746,10 @@ The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}. @item check -The phase runs @code{ninja} with the target specified in @code{#:test-target}, -which is @code{"test"} by default. +The phase runs @samp{meson test} with a base set of options that cannot +be overridden. This base set of options can be extended via the +@code{#:test-options} argument, for example to select or skip a specific +test suite. @item install The phase runs @code{ninja install} and can not be changed. |