New upstream version 18.11.2

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

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 42f4ad0..d37b121 100755 (executable)
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -9,6 +9,7 @@ default_path=$PATH
 # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
 # - DPDK_DEP_ARCHIVE
 # - DPDK_DEP_CFLAGS
+# - DPDK_DEP_ELF (y/[n])
 # - DPDK_DEP_ISAL (y/[n])
 # - DPDK_DEP_JSON (y/[n])
 # - DPDK_DEP_LDFLAGS
@@ -96,6 +97,7 @@ reset_env ()
        unset CROSS
        unset DPDK_DEP_ARCHIVE
        unset DPDK_DEP_CFLAGS
+       unset DPDK_DEP_ELF
        unset DPDK_DEP_ISAL
        unset DPDK_DEP_JSON
        unset DPDK_DEP_LDFLAGS
@@ -148,7 +150,7 @@ config () # <directory> <target> <options>
                test "$DPDK_DEP_ARCHIVE" != y || \
                sed -ri       's,(RESOURCE_TAR=)n,\1y,' $1/.config
                test "$DPDK_DEP_ISAL" != y || \
-               sed -ri           's,(ISAL_PMD=)n,\1y,' $1/.config
+               sed -ri           's,(PMD_ISAL=)n,\1y,' $1/.config
                test "$DPDK_DEP_MLX" != y || \
                sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_SZE" != y || \
@@ -156,6 +158,8 @@ config () # <directory> <target> <options>
                test "$DPDK_DEP_ZLIB" != y || \
                sed -ri          's,(BNX2X_PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_ZLIB" != y || \
+               sed -ri           's,(PMD_ZLIB=)n,\1y,' $1/.config
+               test "$DPDK_DEP_ZLIB" != y || \
                sed -ri   's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config
                test "$DPDK_DEP_PCAP" != y || \
                sed -ri               's,(PCAP=)n,\1y,' $1/.config
@@ -176,7 +180,7 @@ config () # <directory> <target> <options>
                test "$DPDK_DEP_SSL" != y || \
                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,(QAT_SYM=)n,\1y,' $1/.config
                test -z "$FLEXRAN_SDK" || \
                sed -ri     's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config
                sed -ri           's,(SCHED_.*=)n,\1y,' $1/.config
@@ -186,7 +190,9 @@ config () # <directory> <target> <options>
                sed -ri          's,(MVPP2_PMD=)n,\1y,' $1/.config
                test -z "$LIBMUSDK_PATH" || \
                sed -ri         's,(MVNETA_PMD=)n,\1y,' $1/.config
-               test -z "$DPDK_DEP_JSON" || \
+               test "$DPDK_DEP_ELF" != y || \
+               sed -ri            's,(BPF_ELF=)n,\1y,' $1/.config
+               test "$DPDK_DEP_JSON" != y || \
                sed -ri          's,(TELEMETRY=)n,\1y,' $1/.config
                build_config_hook $1 $2 $3