pdump: fix error code check when creating/canceling pthread

[dpdk.git] / devtools / test-build.sh

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 680d79b..092d3a7 100755 (executable)
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -38,16 +38,16 @@ default_path=$PATH
 # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
 # - DPDK_DEP_ARCHIVE
 # - DPDK_DEP_CFLAGS
-# - DPDK_DEP_ISAL_CRYPTO (y/[n])
 # - DPDK_DEP_LDFLAGS
-# - DPDK_DEP_MOFED (y/[n])
-# - DPDK_DEP_NUMA (y/[n])
+# - DPDK_DEP_MLX (y/[n])
+# - DPDK_DEP_NUMA ([y]/n)
 # - DPDK_DEP_PCAP (y/[n])
 # - DPDK_DEP_SSL (y/[n])
 # - DPDK_DEP_SZE (y/[n])
 # - DPDK_DEP_ZLIB (y/[n])
 # - DPDK_MAKE_JOBS (int)
 # - DPDK_NOTIFY (notify-send)
+# - LIBMUSDK_PATH
 # - LIBSSO_SNOW3G_PATH
 # - LIBSSO_KASUMI_PATH
 # - LIBSSO_ZUC_PATH
@@ -66,7 +66,7 @@ print_help () {
        options:
                -h    this help
                -jX   use X parallel jobs in "make"
-               -s    short test with only first config without examples/doc
+               -s    short test only first config without tests|examples|doc
                -v    verbose build
 
        config: defconfig[[~][+]option1[[~][+]option2...]]
@@ -121,9 +121,8 @@ reset_env ()
        unset CROSS
        unset DPDK_DEP_ARCHIVE
        unset DPDK_DEP_CFLAGS
-       unset DPDK_DEP_ISAL_CRYPTO
        unset DPDK_DEP_LDFLAGS
-       unset DPDK_DEP_MOFED
+       unset DPDK_DEP_MLX
        unset DPDK_DEP_NUMA
        unset DPDK_DEP_PCAP
        unset DPDK_DEP_SSL
@@ -131,6 +130,7 @@ reset_env ()
        unset DPDK_DEP_ZLIB
        unset AESNI_MULTI_BUFFER_LIB_PATH
        unset ARMV8_CRYPTO_LIB_PATH
+       unset LIBMUSDK_PATH
        unset LIBSSO_SNOW3G_PATH
        unset LIBSSO_KASUMI_PATH
        unset LIBSSO_ZUC_PATH
@@ -163,13 +163,13 @@ config () # <directory> <target> <options>
                sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
 
                # Automatic configuration
-               test "$DPDK_DEP_NUMA" != y || \
-               sed -ri               's,(NUMA=)n,\1y,' $1/.config
+               test "$DPDK_DEP_NUMA" != n || \
+               sed -ri             's,(NUMA.*=)y,\1n,' $1/.config
                sed -ri    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
                sed -ri             's,(BYPASS=)n,\1y,' $1/.config
                test "$DPDK_DEP_ARCHIVE" != y || \
                sed -ri       's,(RESOURCE_TAR=)n,\1y,' $1/.config
-               test "$DPDK_DEP_MOFED" != y || \
+               test "$DPDK_DEP_MLX" != y || \
                sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_SZE" != y || \
                sed -ri       's,(PMD_SZEDATA2=)n,\1y,' $1/.config
@@ -182,7 +182,7 @@ config () # <directory> <target> <options>
                sed -ri   's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config
                test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
                sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
-               test "$DPDK_DEP_ISAL_CRYPTO" != y || \
+               test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
                sed -ri      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
                test -z "$LIBSSO_SNOW3G_PATH" || \
                sed -ri         's,(PMD_SNOW3G=)n,\1y,' $1/.config
@@ -194,8 +194,9 @@ config () # <directory> <target> <options>
                sed -ri        's,(PMD_OPENSSL=)n,\1y,' $1/.config
                test "$DPDK_DEP_SSL" != y || \
                sed -ri            's,(PMD_QAT=)n,\1y,' $1/.config
-               sed -ri        's,(KNI_VHOST.*=)n,\1y,' $1/.config
                sed -ri           's,(SCHED_.*=)n,\1y,' $1/.config
+               test -z "$LIBMUSDK_PATH" || \
+               sed -ri    's,(PMD_MRVL_CRYPTO=)n,\1y,' $1/.config
                build_config_hook $1 $2 $3
 
                # Explicit enabler/disabler (uppercase)
@@ -231,16 +232,15 @@ for conf in $configs ; do
        make -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
                EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
        ! $short || break
+       echo "================== Build tests for $dir"
+       make test-build -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
+               EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
        echo "================== Build examples for $dir"
        export RTE_SDK=$(pwd)
        export RTE_TARGET=$dir
        make -j$J -sC examples \
                EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
                O=$(readlink -m $dir/examples)
-       ! echo $target | grep -q '^x86_64' || \
-       make -j$J -sC examples/performance-thread \
-               EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
-               O=$(readlink -m $dir/examples/performance-thread)
        unset RTE_TARGET
        echo "################## $dir done."
        unset dir