X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=scripts%2Ftest-build.sh;h=e8971fef3fb6d4d59d7e49a2750abc639f162a3b;hb=50a3345fa9ea6482f197567497b0b8d201173a59;hp=808e8e4f850c7cead9e5e9c46e27bea5b9bcdd6d;hpb=c7e8b41ad48ee6174dfb8b7e8bdc238639ceaccc;p=dpdk.git

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 808e8e4f85..e8971fef3f 100755
--- a/scripts/test-build.sh
+++ b/scripts/test-build.sh
@@ -35,16 +35,20 @@ default_path=$PATH
 # Load config options:
 # - AESNI_MULTI_BUFFER_LIB_PATH
 # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
+# - DPDK_DEP_ARCHIVE
 # - 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)
-. $(dirname $(readlink -e $0))/load-devel-config.sh
+# - LIBSSO_SNOW3G_PATH
+# - LIBSSO_KASUMI_PATH
+. $(dirname $(readlink -e $0))/load-devel-config
 
 print_usage () {
 	echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
@@ -60,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
@@ -74,11 +79,13 @@ print_help () {
 
 J=$DPDK_MAKE_JOBS
 short=false
+unset verbose
 maxerr=-Wfatal-errors
-while getopts hj:s ARG ; do
+while getopts hj:sv ARG ; do
 	case $ARG in
 		j ) J=$OPTARG ;;
 		s ) short=true ;;
+		v ) verbose='V=1' ;;
 		h ) print_help ; exit 0 ;;
 		? ) print_usage ; exit 1 ;;
 	esac
@@ -89,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
@@ -108,20 +116,29 @@ reset_env ()
 {
 	export PATH=$default_path
 	unset CROSS
+	unset DPDK_DEP_ARCHIVE
 	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_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
 
@@ -133,21 +150,27 @@ config () # <directory> <target> <options>
 		sed -ri           's,(NEXT_ABI=)y,\1n,' $1/.config
 		! echo $3 | grep -q '+shared' || \
 		sed -ri         's,(SHARED_LIB=)n,\1y,' $1/.config
-		! echo $3 | grep -q '+debug' || \
-		sed -ri            's,(DEBUG.*=)n,\1y,' $1/.config
+		! echo $3 | grep -q '+debug' || ( \
+		sed -ri     's,(RTE_LOG_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config
+		sed -ri           's,(_DEBUG.*=)n,\1y,' $1/.config
+		sed -ri            's,(_STAT.*=)n,\1y,' $1/.config
+		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 || \
+		sed -ri       's,(RESOURCE_TAR=)n,\1y,' $1/.config
 		test "$DPDK_DEP_MOFED" != y || \
 		sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SZE" != y || \
 		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
@@ -155,11 +178,14 @@ 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_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
 		sed -ri           's,(SCHED_.*=)n,\1y,' $1/.config
-		sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config
 		build_config_hook $1 $2 $3
 
 		# Explicit enabler/disabler (uppercase)
@@ -185,7 +211,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
@@ -193,20 +219,21 @@ for conf in $configs ; do
 
 	echo "================== Build $dir"
 	make -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" O=$dir
+		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	! $short || break
 	echo "================== Build examples for $dir"
 	export RTE_SDK=$(pwd)
 	export RTE_TARGET=$dir
 	make -j$J -sC examples \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" \
+		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" \
+		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
 		O=$(readlink -m $dir/examples/performance-thread)
 	unset RTE_TARGET
 	echo "################## $dir done."
+	unset dir
 done
 
 if ! $short ; then