Skip to contentSkip to conversation

devtools/test-meson-builds: add verbose output options

PATCH Applied Bruce Richardson 2 participants 2 messages Feb 26, 2019 – Mar 1, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devtools/test-meson-builds: add verbose output options

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.

---
 devtools/test-meson-builds.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
devtools/test-meson-builds.sh +18 -2
index 3edc805f6..0227dc52a 100755
@@ -30,10 +30,26 @@ build () # <directory> <meson options>
 		$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
Signature · 1 line
2.20.1
#1 lore raw

26/02/2019 15:15, Bruce Richardson:

Quoted 11 lines

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.

Applied, thanks