devtools: fix meson build test for plain bourne shell

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

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 9868c32..630a1a6 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -7,25 +7,61 @@
 # * if a build-directory already exists we assume it was properly configured
 # Run ninja after configuration is done.
 
-srcdir=$(dirname $(readlink -m $0))/..
+# set pipefail option if possible
+PIPEFAIL=""
+set -o | grep -q pipefail && set -o pipefail && PIPEFAIL=1
+
+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
+elif command -v ninja-build >/dev/null 2>&1 ; then
+       ninja_cmd=ninja-build
+else
+       echo "ERROR: ninja is not found" >&2
+       exit 1
+fi
 
 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 -C $builddir"
-       ninja -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
+# we can't use plain verbose when we don't have pipefail option so up-level
+if [ -z "$PIPEFAIL" -a -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
+       echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE"
+       TEST_MESON_BUILD_VERY_VERBOSE=1
+fi
+
 # shared and static linked builds with gcc and clang
 for c in gcc clang ; do
+       command -v $c >/dev/null 2>&1 || continue
        for s in static shared ; do
                export CC="ccache $c"
                build build-$c-$s --default-library=$s
@@ -33,14 +69,24 @@ for c in gcc clang ; do
 done
 
 # test compilation with minimal x86 instruction set
-build build-x86-default -Dmachine=nehalem
+default_machine='nehalem'
+ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false)
+if [ "$ok" = "false" ] ; then
+       default_machine='corei7'
+fi
+build build-x86-default -Dmachine=$default_machine $use_shared
 
 # enable cross compilation if gcc cross-compiler is found
-for f in config/arm/arm*gcc ; do
-       c=aarch64-linux-gnu-gcc
-       if ! command -v $c >/dev/null 2>&1 ; then
-               continue
-       fi
-       export CC="ccache $c"
-       build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) --cross-file $f
-done
+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 $use_shared \
+               --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
+
+       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
+       done
+fi