bus/vdev: fix debug message on probing

[dpdk.git] / devtools / test-meson-builds.sh

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 951c906..f82a0fd 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -7,8 +7,9 @@
 # * if a build-directory already exists we assume it was properly configured
 # Run ninja after configuration is done.
 
-srcdir=$(dirname $(readlink -m $0))/..
+srcdir=$(dirname $(readlink -f $0))/..
 MESON=${MESON:-meson}
+use_shared="--default-library=shared"
 
 if command -v ninja >/dev/null 2>&1 ; then
        ninja_cmd=ninja
@@ -23,16 +24,32 @@ build () # <directory> <meson options>
 {
        builddir=$1
        shift
-       if [ ! -d "$builddir" ] ; then
+       if [ ! -f "$builddir/build.ninja" ] ; then
                options="--werror -Dexamples=all $*"
                echo "$MESON $options $srcdir $builddir"
                $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
@@ -42,19 +59,19 @@ for c in gcc clang ; do
 done
 
 # test compilation with minimal x86 instruction set
-build build-x86-default -Dmachine=nehalem
+build build-x86-default -Dmachine=nehalem $use_shared
 
 # enable cross compilation if gcc cross-compiler is found
 c=aarch64-linux-gnu-gcc
 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 --cross-file \
-               config/arm/arm64_armv8_linuxapp_gcc
+       build build-arm64-host-clang $use_shared \
+               --cross-file config/arm/arm64_armv8_linuxapp_gcc
 
        for f in config/arm/arm*gcc ; do
                export CC="ccache gcc"
                build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \
-                       --cross-file $f
+                       $use_shared --cross-file $f
        done
 fi