On Fri, 2020-11-13 at 16:58 +0100, Michal Privoznik wrote:
On 11/8/20 10:24 PM, Roman Bolshakov wrote:
> - - if test "$(uname)" = "FreeBSD"; then ninja -C build dist;
fi
> - - if test "$(uname)" = "Darwin"; then ninja -C build
&& ninja -C build install; fi
> + - ninja -C build dist
If we go with --timeout-multiplier= as I'm suggesting in 3/4 then this
can't be ninja, but meson. I'm not sure what the whole point of 'ninja'
is at this point, sorry.
ninja is the low-level tool, so in some cases (notably running the
test suite) having meson call ninja instead of invoking the latter
directly can enable additional features.
In this case, I assume 'ninja dist' will use 'ninja test' rather than
'meson test', so we might have to do something like
- if test "$(uname)" = "FreeBSD"; then cd build && ninja
dist; fi
- if test "$(uname)" = "Darwin"; then cd build && ninja
&& meson test --timeout-multiplier=X && ninja install; fi
to run the test suite on macOS without hitting the timeout.
--
Andrea Bolognani / Red Hat / Virtualization