net: add MPLS header structure

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

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 9868c32..79109b7 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -9,6 +9,16 @@
 
 srcdir=$(dirname $(readlink -m $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>
 {
@@ -20,8 +30,8 @@ build () # <directory> <meson options>
                $MESON $options $srcdir $builddir
                unset CC
        fi
-       echo "ninja -C $builddir"
-       ninja -C $builddir
+       echo "$ninja_cmd -C $builddir"
+       $ninja_cmd -C $builddir
 }
 
 # shared and static linked builds with gcc and clang
@@ -33,14 +43,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
-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 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) \
+                       $use_shared --cross-file $f
+       done
+fi