Imported Upstream version 17.05

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

diff --git a/scripts/test-build.sh b/devtools/test-build.sh
similarity index 94%
rename from scripts/test-build.sh
rename to devtools/test-build.sh
index a979309..61bdce7 100755 (executable)
--- a/scripts/test-build.sh
+++ b/devtools/test-build.sh
@@ -34,9 +34,11 @@ default_path=$PATH
 
 # Load config options:
 # - AESNI_MULTI_BUFFER_LIB_PATH
+# - ARMV8_CRYPTO_LIB_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])
@@ -64,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...]]
@@ -119,6 +121,7 @@ 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_NUMA
@@ -127,6 +130,7 @@ reset_env ()
        unset DPDK_DEP_SZE
        unset DPDK_DEP_ZLIB
        unset AESNI_MULTI_BUFFER_LIB_PATH
+       unset ARMV8_CRYPTO_LIB_PATH
        unset LIBSSO_SNOW3G_PATH
        unset LIBSSO_KASUMI_PATH
        unset LIBSSO_ZUC_PATH
@@ -174,9 +178,11 @@ config () # <directory> <target> <options>
                sed -ri            's,(NFP_PMD=)n,\1y,' $1/.config
                test "$DPDK_DEP_PCAP" != y || \
                sed -ri               's,(PCAP=)n,\1y,' $1/.config
+               test -z "$ARMV8_CRYPTO_LIB_PATH" || \
+               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 -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
+               test "$DPDK_DEP_ISAL_CRYPTO" != y || \
                sed -ri      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
                test -z "$LIBSSO_SNOW3G_PATH" || \
                sed -ri         's,(PMD_SNOW3G=)n,\1y,' $1/.config
@@ -188,7 +194,6 @@ 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
                build_config_hook $1 $2 $3
 
@@ -225,16 +230,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