devtools: fix bash-isms in meson test

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

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index f0d5c9a..0ea79f4 100755 (executable)
--- 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"
@@ -44,14 +46,15 @@ build () # <directory> <meson options>
        fi
 }
 
-if [ "$1" == "-vv" ] ; then
+if [ "$1" = "-vv" ] ; then
        TEST_MESON_BUILD_VERY_VERBOSE=1
-elif [ "$1" == "-v" ] ; then
+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
+       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
@@ -59,7 +62,12 @@ for c in gcc clang ; do
 done
 
 # test compilation with minimal x86 instruction set
-build build-x86-default -Dmachine=nehalem $use_shared
+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
 c=aarch64-linux-gnu-gcc
@@ -67,9 +75,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_linux_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