From be2c8a440e15b0ac0bd109548d944afbff7a0db7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 8 Aug 2024 23:08:36 -0400 Subject: [PATCH] common/build-style/meson: use meson test/install instead of ninja per eschwartz's advice --- common/build-style/meson.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index 5ea2eeda400..052cf89a758 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -51,11 +51,12 @@ do_build() { } do_check() { - : ${make_cmd:=ninja} + : ${make_cmd:=meson} : ${make_check_target:=test} : ${meson_builddir:=build} - ${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target} + export PYTHONUNBUFFERED=1 + ${make_check_pre} ${make_cmd} ${make_check_target} -C ${meson_builddir} ${makejobs} ${make_check_args} } do_install() { @@ -63,5 +64,5 @@ do_install() { : ${make_install_target:=install} : ${meson_builddir:=build} - DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} + env PYTHONUNBUFFERED=1 DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} }