Commit 6a8a1b6b authored by Jim Harris's avatar Jim Harris Committed by Darek Stojaczyk
Browse files

test: always parse common script args 



Good suggestion from Darek - let's just always
parse common script args from autotest_common.sh.
These arguments follow common arg naming conventions
(i.e. --iso) so there's no harm just doing this for
any test that sources autotest_common.sh.  This has
the nice effect of not requiring scripts to
explicitly call this function.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Id89b68c22557a5a771be407873d0e57843f0d05a

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455552


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 4227aeb7

test/common/autotest_common.sh

+15 −17
Original line number Diff line number Diff line
@@ -189,6 +189,21 @@ if [ -z "$output_dir" ]; then 
	export output_dir

fi



TEST_MODE=

for i in "$@"; do

	case "$i" in

		--iso)

			TEST_MODE=iso

			;;

		--transport=*)

			TEST_TRANSPORT="${i#*=}"

			;;

		--sock=*)

			TEST_SOCK="${i#*=}"

			;;

	esac

done



function timing() {

	direction="$1"

	testname="$2"
@@ -236,23 +251,6 @@ function timing_finish() { 
	fi

}



function parse_common_script_args() {

	TEST_MODE=

	for i in "$@"; do

		case "$i" in

			--iso)

				TEST_MODE=iso

				;;

			--transport=*)

				TEST_TRANSPORT="${i#*=}"

				;;

			--sock=*)

				TEST_SOCK="${i#*=}"

				;;

		esac

	done

}



function create_test_list() {

	grep -rshI --exclude="autotest_common.sh" --exclude="$rootdir/test/common/autotest_common.sh" -e "report_test_completion" $rootdir | sed 's/report_test_completion//g; s/[[:blank:]]//g; s/"//g;' > $output_dir/all_tests.txt || true

}

test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



parse_common_script_args $@



iscsitestinit $1 $2



timing_enter bdev_io_wait

test/nvmf/host/aer.sh

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/nvmf/common.sh



parse_common_script_args $@



rpc_py="$rootdir/scripts/rpc.py"



set -e

test/nvmf/host/bdevperf.sh

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/nvmf/common.sh



parse_common_script_args $@



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512

test/nvmf/host/fio.sh

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ source $rootdir/test/common/autotest_common.sh 
source $rootdir/scripts/common.sh

source $rootdir/test/nvmf/common.sh



parse_common_script_args $@



rpc_py="$rootdir/scripts/rpc.py"



set -e