X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=devtools%2Ftest-meson-builds.sh;h=b3b5cfbb54fbc8d29a83862440fa50d2c5a79120;hb=578505ef07f4643530ad142f50888cfb82ab2e74;hp=e59474d53bd8fd81568f9cb857ab3042a1d00664;hpb=3655096fb1dee33ce1e1f63da7b8b3b0c3aa3c2d;p=dpdk.git

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e59474d53b..b3b5cfbb54 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -7,6 +7,8 @@
 # * if a build-directory already exists we assume it was properly configured
 # Run ninja after configuration is done.
 
+set -o pipefail
+
 srcdir=$(dirname $(readlink -f $0))/..
 MESON=${MESON:-meson}
 use_shared="--default-library=shared"
@@ -30,10 +32,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
@@ -51,9 +69,9 @@ if command -v $c >/dev/null 2>&1 ; then
 	# compile the general v8a also for clang to increase coverage
 	export CC="ccache clang"
 	build build-arm64-host-clang $use_shared \
-		--cross-file config/arm/arm64_armv8_linuxapp_gcc
+		--cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
 
-	for f in config/arm/arm*gcc ; do
+	for f in $srcdir/config/arm/arm*gcc ; do
 		export CC="ccache gcc"
 		build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \
 			$use_shared --cross-file $f