From 4bcb9b7686043fe9a4e669f2d7f5acee603f5409 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 26 Feb 2019 14:15:33 +0000 Subject: [PATCH] devtools: add verbose option to meson build test When running ninja, the commands are, by default, always printed on top of each other. For those who want more detail in the output, two levels of verbose output has been added to the test-meson-builds script. When "-v" is passed, or the "TEST_MESON_BUILD_VERBOSE" flag is set in the environment, then the output of ninja is passed through "cat" to prevent each line overwriting the next. If "-vv" is passed, or "TEST_MESON_BUILD_VERY_VERBOSE" is set in the environment, then ninja is called with the "-v" flag to print out each command in full as it is executing. Signed-off-by: Bruce Richardson --- devtools/test-meson-builds.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index e59474d53b..f82a0fd6c7 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -30,10 +30,26 @@ build () # $MESON $options $srcdir $builddir unset CC fi - echo "$ninja_cmd -C $builddir" - $ninja_cmd -C $builddir + if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then + # for full output from ninja use "-v" + echo "$ninja_cmd -v -C $builddir" + $ninja_cmd -v -C $builddir + elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then + # for keeping the history of short cmds, pipe through cat + echo "$ninja_cmd -C $builddir | cat" + $ninja_cmd -C $builddir | cat + else + echo "$ninja_cmd -C $builddir" + $ninja_cmd -C $builddir + fi } +if [ "$1" == "-vv" ] ; then + TEST_MESON_BUILD_VERY_VERBOSE=1 +elif [ "$1" == "-v" ] ; then + TEST_MESON_BUILD_VERBOSE=1 +fi + # shared and static linked builds with gcc and clang for c in gcc clang ; do for s in static shared ; do -- 2.20.1