scripts: fix libnuma dependency in build test

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

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 9a11f94..f9748d3 100755 (executable)
--- a/scripts/test-build.sh
+++ b/scripts/test-build.sh
@@ -39,13 +39,15 @@ 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])
 # - DPDK_DEP_ZLIB (y/[n])
 # - DPDK_MAKE_JOBS (int)
 # - DPDK_NOTIFY (notify-send)
-# - LIBSSO_PATH
+# - LIBSSO_SNOW3G_PATH
+# - LIBSSO_KASUMI_PATH
 . $(dirname $(readlink -e $0))/load-devel-config.sh
 
 print_usage () {
@@ -62,6 +64,7 @@ print_help () {
                -h    this help
                -jX   use X parallel jobs in "make"
                -s    short test with only first config without examples/doc
+               -v    verbose build
 
        config: defconfig[[~][+]option1[[~][+]option2...]]
                Example: x86_64-native-linuxapp-gcc+debug~RXTX_CALLBACKS
@@ -93,12 +96,13 @@ configs=${*:-$DPDK_BUILD_TEST_CONFIGS}
 success=false
 on_exit ()
 {
-       if [ "$DPDK_NOTIFY" = notify-send ] ; then
-               if $success ; then
+       if $success ; then
+               [ "$DPDK_NOTIFY" != notify-send ] || \
                        notify-send -u low --icon=dialog-information 'DPDK build' 'finished'
-               elif [ -z "$signal" ] ; then
+       elif [ -z "$signal" ] ; then
+               [ -z "$dir" ] || echo "failed to build $dir" >&2
+               [ "$DPDK_NOTIFY" != notify-send ] || \
                        notify-send -u low --icon=dialog-error 'DPDK build' 'failed'
-               fi
        fi
 }
 # catch manual interrupt to ignore notification
@@ -116,18 +120,25 @@ 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
        unset DPDK_DEP_ZLIB
        unset AESNI_MULTI_BUFFER_LIB_PATH
-       unset LIBSSO_PATH
+       unset LIBSSO_SNOW3G_PATH
+       unset LIBSSO_KASUMI_PATH
        unset PQOS_INSTALL_PATH
 }
 
 config () # <directory> <target> <options>
 {
-       if [ ! -e $1/.config ] ; then
+       reconfig=false
+       if git rev-parse 2>&- && [ -n "$(git diff HEAD~ -- config)" ] ; then
+               echo 'Default config may have changed'
+               reconfig=true
+       fi
+       if [ ! -e $1/.config ] || $reconfig ; then
                echo "================== Configure $1"
                make T=$2 O=$1 config
 
@@ -146,7 +157,7 @@ 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
@@ -159,6 +170,8 @@ config () # <directory> <target> <options>
                sed -ri       's,(PMD_SZEDATA2=)n,\1y,' $1/.config
                test "$DPDK_DEP_ZLIB" != y || \
                sed -ri          's,(BNX2X_PMD=)n,\1y,' $1/.config
+               test "$DPDK_DEP_ZLIB" != y || \
+               sed -ri           's,(QEDE_PMD=)n,\1y,' $1/.config
                sed -ri            's,(NFP_PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_PCAP" != y || \
                sed -ri               's,(PCAP=)n,\1y,' $1/.config
@@ -166,8 +179,10 @@ config () # <directory> <target> <options>
                sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
                test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
                sed -ri      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
-               test -z "$LIBSSO_PATH" || \
+               test -z "$LIBSSO_SNOW3G_PATH" || \
                sed -ri         's,(PMD_SNOW3G=)n,\1y,' $1/.config
+               test -z "$LIBSSO_KASUMI_PATH" || \
+               sed -ri         's,(PMD_KASUMI=)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
@@ -219,6 +234,7 @@ for conf in $configs ; do
                O=$(readlink -m $dir/examples/performance-thread)
        unset RTE_TARGET
        echo "################## $dir done."
+       unset dir
 done
 
 if ! $short ; then