raw/ifpga: remove virtual devices on close

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

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index daf817a..a653b25 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -220,15 +220,18 @@ for c in gcc clang ; do
        done
 done
 
+build build-mini cc skipABI $use_shared -Ddisable_libs=* \
+       -Denable_drivers=net/null
+
 # test compilation with minimal x86 instruction set
 # Set the install path for libraries to "lib" explicitly to prevent problems
 # with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later.
-generic_machine='nehalem'
-if ! check_cc_flags "-march=$generic_machine" ; then
-       generic_machine='corei7'
+generic_isa='nehalem'
+if ! check_cc_flags "-march=$generic_isa" ; then
+       generic_isa='corei7'
 fi
 build build-x86-generic cc skipABI -Dcheck_includes=true \
-       -Dlibdir=lib -Dmachine=$generic_machine $use_shared
+       -Dlibdir=lib -Dcpu_instruction_set=$generic_isa $use_shared
 
 # 32-bit with default compiler
 if check_cc_flags '-m32' ; then
@@ -243,7 +246,8 @@ if check_cc_flags '-m32' ; then
                export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig'
        fi
        target_override='i386-pc-linux-gnu'
-       build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32'
+       build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \
+                       -Dcpp_args='-m32' -Dcpp_link_args='-m32'
        target_override=
        unset PKG_CONFIG_LIBDIR
 fi