New upstream version 17.11-rc3

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

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index c6dfaf0..092d3a7 100755 (executable)
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -39,7 +39,7 @@ default_path=$PATH
 # - DPDK_DEP_ARCHIVE
 # - DPDK_DEP_CFLAGS
 # - DPDK_DEP_LDFLAGS
-# - DPDK_DEP_MOFED (y/[n])
+# - DPDK_DEP_MLX (y/[n])
 # - DPDK_DEP_NUMA ([y]/n)
 # - DPDK_DEP_PCAP (y/[n])
 # - DPDK_DEP_SSL (y/[n])
@@ -47,6 +47,7 @@ default_path=$PATH
 # - DPDK_DEP_ZLIB (y/[n])
 # - DPDK_MAKE_JOBS (int)
 # - DPDK_NOTIFY (notify-send)
+# - LIBMUSDK_PATH
 # - LIBSSO_SNOW3G_PATH
 # - LIBSSO_KASUMI_PATH
 # - LIBSSO_ZUC_PATH
@@ -121,7 +122,7 @@ reset_env ()
        unset DPDK_DEP_ARCHIVE
        unset DPDK_DEP_CFLAGS
        unset DPDK_DEP_LDFLAGS
-       unset DPDK_DEP_MOFED
+       unset DPDK_DEP_MLX
        unset DPDK_DEP_NUMA
        unset DPDK_DEP_PCAP
        unset DPDK_DEP_SSL
@@ -129,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
@@ -167,7 +169,7 @@ config () # <directory> <target> <options>
                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
@@ -193,6 +195,8 @@ config () # <directory> <target> <options>
                test "$DPDK_DEP_SSL" != y || \
                sed -ri            's,(PMD_QAT=)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)