X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=devtools%2Ftest-build.sh;h=f01365602413dd94a1031afbbfbdde6b8b307f43;hb=ef5391b7658b0ce9c0626bf3ecdc3db600e44c0e;hp=c30c53d1894a122010d57751bfd1624c5b014a23;hpb=777014e56d0796861c11126cf0b4836d4d42f2d4;p=dpdk.git

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index c30c53d189..f013656024 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -14,6 +14,7 @@ default_path=$PATH
 # - DPDK_DEP_BPF (y/[n])
 # - DPDK_DEP_CFLAGS
 # - DPDK_DEP_ELF (y/[n])
+# - DPDK_DEP_FDT (y/[n])
 # - DPDK_DEP_ISAL (y/[n])
 # - DPDK_DEP_JSON (y/[n])
 # - DPDK_DEP_LDFLAGS
@@ -29,9 +30,6 @@ default_path=$PATH
 # - DPDK_NOTIFY (notify-send)
 # - FLEXRAN_SDK
 # - LIBMUSDK_PATH
-# - LIBSSO_SNOW3G_PATH
-# - LIBSSO_KASUMI_PATH
-# - LIBSSO_ZUC_PATH
 devtools_dir=$(dirname $(readlink -f $0))
 . $devtools_dir/load-devel-config
 
@@ -70,8 +68,6 @@ J=$DPDK_MAKE_JOBS
 builds_dir=${DPDK_BUILD_TEST_DIR:-.}
 short=false
 unset verbose
-# for ABI checks, we need debuginfo
-test_cflags="-Wfatal-errors -g"
 while getopts hj:sv ARG ; do
 	case $ARG in
 		j ) J=$OPTARG ;;
@@ -111,6 +107,7 @@ reset_env ()
 	unset DPDK_DEP_BPF
 	unset DPDK_DEP_CFLAGS
 	unset DPDK_DEP_ELF
+	unset DPDK_DEP_FDT
 	unset DPDK_DEP_ISAL
 	unset DPDK_DEP_JSON
 	unset DPDK_DEP_LDFLAGS
@@ -125,9 +122,6 @@ reset_env ()
 	unset ARMV8_CRYPTO_LIB_PATH
 	unset FLEXRAN_SDK
 	unset LIBMUSDK_PATH
-	unset LIBSSO_SNOW3G_PATH
-	unset LIBSSO_KASUMI_PATH
-	unset LIBSSO_ZUC_PATH
 	unset PQOS_INSTALL_PATH
 }
 
@@ -146,6 +140,8 @@ config () # <directory> <target> <options>
 		# Built-in options (lowercase)
 		! echo $3 | grep -q '+default' || \
 		sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
+		! echo $3 | grep -q '+kmods' || \
+		sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config
 		echo $3 | grep -q '+next' || \
 		sed -ri=""           's,(NEXT_ABI=)y,\1n,' $1/.config
 		! echo $3 | grep -q '+shared' || \
@@ -157,6 +153,8 @@ config () # <directory> <target> <options>
 		sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
 
 		# Automatic configuration
+		! echo $2 | grep -q 'arm64' || \
+		sed -ri=""        's,(ARM_USE_WFE=)n,\1y,' $1/.config
 		test "$DPDK_DEP_NUMA" != n || \
 		sed -ri=""             's,(NUMA.*=)y,\1n,' $1/.config
 		sed -ri=""    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
@@ -165,10 +163,14 @@ config () # <directory> <target> <options>
 		sed -ri=""       's,(RESOURCE_TAR=)n,\1y,' $1/.config
 		test "$DPDK_DEP_BPF" != y || \
 		sed -ri=""         's,(PMD_AF_XDP=)n,\1y,' $1/.config
+		test "$DPDK_DEP_FDT" != y || \
+		sed -ri=""   's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config
+		test "$DPDK_DEP_FDT" != y || \
+		sed -ri=""         's,(IPN3KE_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_ISAL" != y || \
 		sed -ri=""           's,(PMD_ISAL=)n,\1y,' $1/.config
 		test "$DPDK_DEP_MLX" != y || \
-		sed -ri=""           's,(MLX._PMD=)n,\1y,' $1/.config
+		sed -ri=""          's,(MLX.*_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_NFB" != y || \
 		sed -ri=""            's,(NFB_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SZE" != y || \
@@ -187,12 +189,12 @@ config () # <directory> <target> <options>
 		sed -ri=""       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
 		test "$DPDK_DEP_IPSEC_MB" != 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
-		test -z "$LIBSSO_KASUMI_PATH" || \
-		sed -ri=""         's,(PMD_KASUMI=)n,\1y,' $1/.config
-		test -z "$LIBSSO_ZUC_PATH" || \
+		test "$DPDK_DEP_IPSEC_MB" != y || \
 		sed -ri=""            's,(PMD_ZUC=)n,\1y,' $1/.config
+		test "$DPDK_DEP_IPSEC_MB" != y || \
+		sed -ri=""         's,(PMD_KASUMI=)n,\1y,' $1/.config
+		test "$DPDK_DEP_IPSEC_MB" != y || \
+		sed -ri=""         's,(PMD_SNOW3G=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SSL" != y || \
 		sed -ri=""            's,(PMD_CCP=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SSL" != y || \
@@ -244,7 +246,7 @@ for conf in $configs ; do
 	config $dir $target $options
 
 	echo "================== Build $conf"
-	${MAKE} -j$J EXTRA_CFLAGS="$test_cflags $DPDK_DEP_CFLAGS" \
+	${MAKE} -j$J EXTRA_CFLAGS="-Wfatal-errors -g $DPDK_DEP_CFLAGS" \
 		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	! $short || break
 	export RTE_TARGET=$target
@@ -253,10 +255,12 @@ for conf in $configs ; do
 	echo "================== Build examples for $conf"
 	export RTE_SDK=$(readlink -f $dir)/install/share/dpdk
 	ln -sTf $(pwd)/lib $RTE_SDK/lib # workaround for vm_power_manager
+	grep -q 'SHARED_LIB=n' $dir/.config || # skip examples with static libs
 	${MAKE} -j$J -sC examples \
 		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
 		O=$(readlink -f $dir)/examples
 	unset RTE_TARGET
+	grep -q 'SHARED_LIB=n' $dir/.config || # skip ABI check with static libs
 	if [ -n "$DPDK_ABI_REF_VERSION" ]; then
 		abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION
 		if [ ! -d $abirefdir/$conf ]; then
@@ -276,7 +280,7 @@ for conf in $configs ; do
 			echo -n "================== Build $conf "
 			echo "($DPDK_ABI_REF_VERSION)"
 			${MAKE} -j$J \
-				EXTRA_CFLAGS="$test_cflags $DPDK_DEP_CFLAGS" \
+				EXTRA_CFLAGS="-Wno-error -g $DPDK_DEP_CFLAGS" \
 				EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
 				O=$abirefdir/build
 			export RTE_TARGET=$target