Commit eaebf841 authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

autotest_common.sh: change rpc_py to rpc_cmd 



Change rpc_py to use rpc_cmd function.
The former needs to be defined explicitly in the scripts
that uses function, while the latter is a function
already available in autotest_common.sh.
Additionally delete unnecessary rpc_py declarations
and override rpc_cmd where additional arguments are
needed (like -s sock_name.sock).

Change-Id: I835f7eb308cd77658a2a425e153ab7ca460b5b61
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12872


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 4cbd23e2

test/bdev/bdev_raid.sh

+2 −1
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@ 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

rpc_server=/var/tmp/spdk-raid.sock

rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"

tmp_file=$SPDK_TEST_STORAGE/raidrandtest



source $rootdir/test/common/autotest_common.sh

source $testdir/nbd_common.sh



rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"



function raid_unmap_data_verify() {

	if hash blkdiscard; then

		local nbd=$1

test/blobstore/blob_io_wait/blob_io_wait.sh

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ fi 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

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



truncate -s 64M $testdir/aio.bdev

test/common/autotest_common.sh

+2 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash



rpc_py=rpc_cmd



function xtrace_fd() {

	if [[ -n $BASH_XTRACEFD && -e /proc/self/fd/$BASH_XTRACEFD ]]; then

		# Close it first to make sure it's sane

test/compress/compress.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ set -e 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

plugindir=$rootdir/examples/bdev/fio_plugin

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

source "$rootdir/scripts/common.sh"

source "$rootdir/test/common/autotest_common.sh"

source "$rootdir/test/nvmf/common.sh"

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



function error_cleanup() {

	# force delete pmem file and wipe on-disk metadata

test/dpdk_memory_utility/test_dpdk_mem_info.sh

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh



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

MEM_SCRIPT="$rootdir/scripts/dpdk_mem_info.py"



"${SPDK_APP[@]}" &