X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=inline;f=scripts%2Ftest-build.sh;h=5cadc08697200b0f296cfba4b746de2f5b7d477b;hb=e25200fbb45d;hp=6e67c8fc6869cf327e3fa0cf932e878b002d6a94;hpb=99d47f445eb0d83e642d121119d3293b5a7f9e9d;p=dpdk.git

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 6e67c8fc68..5cadc08697 100755
--- a/scripts/test-build.sh
+++ b/scripts/test-build.sh
@@ -40,7 +40,25 @@
 . scripts/load-devel-config.sh
 
 print_usage () {
-	echo "usage: $(basename $0) [-jX] [-s] [config1 [config2] ...]]"
+	echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
+}
+
+print_help () {
+	echo 'Test building several targets with different options'
+	echo
+	print_usage
+	cat <<- END_OF_HELP
+
+	options:
+	        -h    this help
+	        -jX   use X parallel jobs in "make"
+	        -s    short test with only first config without examples/doc
+
+	config: defconfig name followed by switches delimited with "+" sign
+	        Example: x86_64-native-linuxapp-gcc+next+shared
+	        Default is to enable most of the options.
+	        The external dependencies are setup with DPDK_DEP_* variables.
+	END_OF_HELP
 }
 
 J=$DPDK_MAKE_JOBS
@@ -49,7 +67,7 @@ while getopts hj:s ARG ; do
 	case $ARG in
 		j ) J=$OPTARG ;;
 		s ) short=true ;;
-		h ) print_usage ; exit 0 ;;
+		h ) print_help ; exit 0 ;;
 		? ) print_usage ; exit 1 ;;
 	esac
 done
@@ -83,8 +101,6 @@ 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 combined || \
-		sed -ri       's,(COMBINE_LIBS=)n,\1y,' $1/.config
 		echo $2 | grep -q '^i686' || \
 		sed -ri               's,(NUMA=)n,\1y,' $1/.config
 		sed -ri         's,(PCI_CONFIG=)n,\1y,' $1/.config
@@ -92,7 +108,6 @@ config () # <directory> <target> <options>
 		sed -ri             's,(BYPASS=)n,\1y,' $1/.config
 		test "$DPDK_DEP_MOFED" != y || \
 		echo $2 | grep -q '^clang$' || \
-		echo $3 | grep -q 'shared.*combined' || \
 		sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SZE" != y || \
 		echo $2 | grep -q '^i686' || \
@@ -104,11 +119,8 @@ config () # <directory> <target> <options>
 		sed -ri               's,(PCAP=)n,\1y,' $1/.config
 		test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \
 		echo $2 | grep -q '^i686' || \
-		echo $3 | grep -q 'shared.*combined' || \
 		sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SSL" != y || \
-		echo $2 | grep -q '^i686' || \
-		echo $3 | grep -q 'shared.*combined' || \
 		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