ethdev: fix hotplug attach

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

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 52c89cf..e556fb5 100755 (executable)
--- a/scripts/test-build.sh
+++ b/scripts/test-build.sh
@@ -39,6 +39,7 @@ default_path=$PATH
 # - DPDK_DEP_CFLAGS
 # - DPDK_DEP_LDFLAGS
 # - DPDK_DEP_MOFED (y/[n])
+# - DPDK_DEP_NUMA (y/[n])
 # - DPDK_DEP_PCAP (y/[n])
 # - DPDK_DEP_SSL (y/[n])
 # - DPDK_DEP_SZE (y/[n])
@@ -47,7 +48,8 @@ default_path=$PATH
 # - DPDK_NOTIFY (notify-send)
 # - LIBSSO_SNOW3G_PATH
 # - LIBSSO_KASUMI_PATH
-. $(dirname $(readlink -e $0))/load-devel-config.sh
+# - LIBSSO_ZUC_PATH
+. $(dirname $(readlink -e $0))/load-devel-config
 
 print_usage () {
        echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
@@ -119,6 +121,7 @@ reset_env ()
        unset DPDK_DEP_CFLAGS
        unset DPDK_DEP_LDFLAGS
        unset DPDK_DEP_MOFED
+       unset DPDK_DEP_NUMA
        unset DPDK_DEP_PCAP
        unset DPDK_DEP_SSL
        unset DPDK_DEP_SZE
@@ -126,6 +129,7 @@ reset_env ()
        unset AESNI_MULTI_BUFFER_LIB_PATH
        unset LIBSSO_SNOW3G_PATH
        unset LIBSSO_KASUMI_PATH
+       unset LIBSSO_ZUC_PATH
        unset PQOS_INSTALL_PATH
 }
 
@@ -155,9 +159,8 @@ config () # <directory> <target> <options>
                sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
 
                # Automatic configuration
-               ! echo $2 | grep -q '^x86_64' || \
+               test "$DPDK_DEP_NUMA" != y || \
                sed -ri               's,(NUMA=)n,\1y,' $1/.config
-               sed -ri         's,(PCI_CONFIG=)n,\1y,' $1/.config
                sed -ri    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
                sed -ri             's,(BYPASS=)n,\1y,' $1/.config
                test "$DPDK_DEP_ARCHIVE" != y || \
@@ -181,6 +184,10 @@ config () # <directory> <target> <options>
                sed -ri         's,(PMD_SNOW3G=)n,\1y,' $1/.config
                test -z "$LIBSSO_KASUMI_PATH" || \
                sed -ri         's,(PMD_KASUMI=)n,\1y,' $1/.config
+               test -z "$LIBSSO_ZUC_PATH" || \
+               sed -ri            's,(PMD_ZUC=)n,\1y,' $1/.config
+               test "$DPDK_DEP_SSL" != y || \
+               sed -ri      's,(PMD_LIBCRYPTO=)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
@@ -210,7 +217,7 @@ for conf in $configs ; do
        # reload config with DPDK_TARGET set
        DPDK_TARGET=$target
        reset_env
-       . $(dirname $(readlink -e $0))/load-devel-config.sh
+       . $(dirname $(readlink -e $0))/load-devel-config
 
        options=$(echo $conf | sed 's,[^~+]*,,')
        dir=$conf