ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Shellcheck - correct rule: Expanding an array

Browse Source 
Correct shellcheck rule SC2128: Expanding an array without an index only gives the first element.

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I0e7c335af678114dc78dfb12a02369a69158e435
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/474989
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Maciej Wawryk 2019-11-18 15:55:26 +01:00 committed by Tomasz Zawadzki
parent 97b0f7733f
commit 25f601cfb8
13 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/check_format.sh
View File

@ -242,7 +242,7 @@ if hash shellcheck 2>/dev/null; then
# This SHCK_EXCLUDE list is out "to do" and we work to fix all of this errors. # This SHCK_EXCLUDE list is out "to do" and we work to fix all of this errors.
SHCK_EXCLUDE="SC1083,SC2002,\ SHCK_EXCLUDE="SC1083,SC2002,\
SC2010,SC2012,SC2016,SC2034,SC2045,SC2046,SC2068,SC2086,SC2089,SC2090,\ SC2010,SC2012,SC2016,SC2034,SC2045,SC2046,SC2068,SC2086,SC2089,SC2090,\
SC2097,SC2098,SC2119,SC2120,SC2128" SC2097,SC2098,SC2119,SC2120"
# SPDK fails some error checks which have been deprecated in later versions of shellcheck. # SPDK fails some error checks which have been deprecated in later versions of shellcheck.
# We will not try to fix these error checks, but instead just leave the error types here # We will not try to fix these error checks, but instead just leave the error types here
# so that we can still run with older versions of shellcheck. # so that we can still run with older versions of shellcheck.

4
scripts/setup.sh
View File

@ -264,7 +264,7 @@ function configure_linux_pci {
fi fi
blknames=() blknames=()
get_virtio_names_from_bdf "$bdf" blknames get_virtio_names_from_bdf "$bdf" blknames
for blkname in $blknames; do for blkname in "${blknames[@]}"; do
if [ "$(lsblk /dev/$blkname --output MOUNTPOINT -n | wc -w)" != "0" ]; then if [ "$(lsblk /dev/$blkname --output MOUNTPOINT -n | wc -w)" != "0" ]; then
pci_dev_echo "$bdf" "Active mountpoints on /dev/$blkname, so not binding" pci_dev_echo "$bdf" "Active mountpoints on /dev/$blkname, so not binding"
continue 2 continue 2
@ -612,7 +612,7 @@ function status_linux {
vendor=$(cat /sys/bus/pci/devices/$bdf/vendor) vendor=$(cat /sys/bus/pci/devices/$bdf/vendor)
blknames=() blknames=()
get_virtio_names_from_bdf "$bdf" blknames get_virtio_names_from_bdf "$bdf" blknames
echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t\t${driver:--}\t\t$blknames" echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t\t${driver:--}\t\t" "${blknames[@]}"
done done
done done

2
scripts/vagrant/create_vbox.sh
View File

@ -132,7 +132,7 @@ shift "$((OPTIND-1))" # Discard the options and sentinel --
SPDK_VAGRANT_DISTRO=( "$@" ) SPDK_VAGRANT_DISTRO=( "$@" )
case "$SPDK_VAGRANT_DISTRO" in case "${SPDK_VAGRANT_DISTRO[0]}" in
centos7) centos7)
export SPDK_VAGRANT_DISTRO export SPDK_VAGRANT_DISTRO
;; ;;

3
scripts/vagrant/create_vhost_vm.sh
View File

@ -70,9 +70,10 @@ export INSTALL_DEPS
shift "$((OPTIND-1))" # Discard the options and sentinel -- shift "$((OPTIND-1))" # Discard the options and sentinel --
SPDK_VAGRANT_DISTRO=( "$@" ) SPDK_VAGRANT_DISTRO=( "$@" )
case "$SPDK_VAGRANT_DISTRO" in case "${SPDK_VAGRANT_DISTRO[0]}" in
ubuntu16) ubuntu16)
export SPDK_VAGRANT_DISTRO export SPDK_VAGRANT_DISTRO
;; ;;

38
test/json_config/json_config.sh
View File

@ -42,7 +42,7 @@ RE_UUID="[[:alnum:]-]+"
last_event_id=0 last_event_id=0
function tgt_check_notification_types() { function tgt_check_notification_types() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
local ret=0 local ret=0
local enabled_types="bdev_register local enabled_types="bdev_register
@ -54,7 +54,7 @@ function tgt_check_notification_types() {
ret=1 ret=1
fi fi
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
return $ret return $ret
} }
@ -147,7 +147,7 @@ function json_config_test_shutdown_app() {
} }
function create_bdev_subsystem_config() { function create_bdev_subsystem_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
local expected_notifications=() local expected_notifications=()
@ -159,7 +159,7 @@ function create_bdev_subsystem_config() {
echo "WARNING: No NVMe drive found. Using '$lvol_store_base_bdev' instead." echo "WARNING: No NVMe drive found. Using '$lvol_store_base_bdev' instead."
else else
echo "ERROR: No NVMe drive found and bdev_aio is not supported on $(uname -s)." echo "ERROR: No NVMe drive found and bdev_aio is not supported on $(uname -s)."
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
return 1 return 1
fi fi
fi fi
@ -243,11 +243,11 @@ function create_bdev_subsystem_config() {
tgt_check_notifications "${expected_notifications[@]}" tgt_check_notifications "${expected_notifications[@]}"
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function cleanup_bdev_subsystem_config() { function cleanup_bdev_subsystem_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
if [[ $SPDK_TEST_BLOCKDEV -eq 1 ]]; then if [[ $SPDK_TEST_BLOCKDEV -eq 1 ]]; then
tgt_rpc bdev_lvol_delete lvs_test/clone0 tgt_rpc bdev_lvol_delete lvs_test/clone0
@ -270,11 +270,11 @@ function cleanup_bdev_subsystem_config() {
rbd_cleanup rbd_cleanup
fi fi
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function create_vhost_subsystem_config() { function create_vhost_subsystem_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
tgt_rpc bdev_malloc_create 64 1024 --name MallocForVhost0 tgt_rpc bdev_malloc_create 64 1024 --name MallocForVhost0
tgt_rpc bdev_split_create MallocForVhost0 8 tgt_rpc bdev_split_create MallocForVhost0 8
@ -290,20 +290,20 @@ function create_vhost_subsystem_config() {
# tgt_rpc vhost_create_nvme_controller VhostNvmeCtrlr0 16 # tgt_rpc vhost_create_nvme_controller VhostNvmeCtrlr0 16
# tgt_rpc vhost_nvme_controller_add_ns VhostNvmeCtrlr0 MallocForVhost0p6 # tgt_rpc vhost_nvme_controller_add_ns VhostNvmeCtrlr0 MallocForVhost0p6
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function create_iscsi_subsystem_config() { function create_iscsi_subsystem_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0 tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0
tgt_rpc iscsi_create_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT tgt_rpc iscsi_create_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT
tgt_rpc iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK tgt_rpc iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function create_nvmf_subsystem_config() { function create_nvmf_subsystem_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
RDMA_IP_LIST=$(get_available_rdma_ips) RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1) NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
@ -321,21 +321,21 @@ function create_nvmf_subsystem_config() {
tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf1 tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf1
tgt_rpc nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT" tgt_rpc nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function create_virtio_initiator_config() { function create_virtio_initiator_config() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostScsiCtrlr0 -d scsi VirtioScsiCtrlr0 initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostScsiCtrlr0 -d scsi VirtioScsiCtrlr0
initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostBlkCtrlr0 -d blk VirtioBlk0 initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostBlkCtrlr0 -d blk VirtioBlk0
# TODO: initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostNvmeCtrlr0 -d nvme VirtioNvme0 # TODO: initiator_rpc bdev_virtio_attach_controller -t user -a /var/tmp/VhostNvmeCtrlr0 -d nvme VirtioNvme0
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function json_config_test_init() function json_config_test_init()
{ {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
timing_enter json_config_setup_target timing_enter json_config_setup_target
json_config_test_start_app target --wait-for-rpc json_config_test_start_app target --wait-for-rpc
@ -375,11 +375,11 @@ function json_config_test_init()
tgt_rpc bdev_malloc_create 8 512 --name MallocBdevForConfigChangeCheck tgt_rpc bdev_malloc_create 8 512 --name MallocBdevForConfigChangeCheck
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
} }
function json_config_test_fini() { function json_config_test_fini() {
timing_enter $FUNCNAME timing_enter "${FUNCNAME[0]}"
local ret=0 local ret=0
if [[ -n "${app_pid[initiator]}" ]]; then if [[ -n "${app_pid[initiator]}" ]]; then
@ -396,7 +396,7 @@ function json_config_test_fini() {
fi fi
rm -f "${configs_path[@]}" rm -f "${configs_path[@]}"
timing_exit $FUNCNAME timing_exit "${FUNCNAME[0]}"
return $ret return $ret
} }

46
test/nvmf/nvmf.sh
View File

@ -15,43 +15,43 @@ trap "exit 1" SIGINT SIGTERM EXIT
TEST_ARGS=( "$@" ) TEST_ARGS=( "$@" )
run_test suite test/nvmf/target/filesystem.sh $TEST_ARGS run_test suite test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/discovery.sh $TEST_ARGS run_test suite test/nvmf/target/discovery.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/connect_disconnect.sh $TEST_ARGS run_test suite test/nvmf/target/connect_disconnect.sh "${TEST_ARGS[@]}"
if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then
run_test suite test/nvmf/target/nvme_cli.sh $TEST_ARGS run_test suite test/nvmf/target/nvme_cli.sh "${TEST_ARGS[@]}"
fi fi
run_test suite test/nvmf/target/nvmf_lvol.sh $TEST_ARGS run_test suite test/nvmf/target/nvmf_lvol.sh "${TEST_ARGS[@]}"
#TODO: disabled due to intermittent failures. Need to triage. #TODO: disabled due to intermittent failures. Need to triage.
# run_test suite test/nvmf/target/srq_overwhelm.sh $TEST_ARGS # run_test suite test/nvmf/target/srq_overwhelm.sh $TEST_ARGS
run_test suite test/nvmf/target/nvmf_vhost.sh $TEST_ARGS run_test suite test/nvmf/target/nvmf_vhost.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/bdev_io_wait.sh $TEST_ARGS run_test suite test/nvmf/target/bdev_io_wait.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/create_transport.sh $TEST_ARGS run_test suite test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/multitarget.sh $TEST_ARGS run_test suite test/nvmf/target/multitarget.sh "${TEST_ARGS[@]}"
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then
run_test suite test/nvmf/target/fuzz.sh $TEST_ARGS run_test suite test/nvmf/target/fuzz.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/multiconnection.sh $TEST_ARGS run_test suite test/nvmf/target/multiconnection.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/initiator_timeout.sh $TEST_ARGS run_test suite test/nvmf/target/initiator_timeout.sh "${TEST_ARGS[@]}"
fi fi
run_test suite test/nvmf/target/nmic.sh $TEST_ARGS run_test suite test/nvmf/target/nmic.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/rpc.sh $TEST_ARGS run_test suite test/nvmf/target/rpc.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/fio.sh $TEST_ARGS run_test suite test/nvmf/target/fio.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/shutdown.sh $TEST_ARGS run_test suite test/nvmf/target/shutdown.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/target/bdevio.sh $TEST_ARGS run_test suite test/nvmf/target/bdevio.sh "${TEST_ARGS[@]}"
timing_enter host timing_enter host
run_test suite test/nvmf/host/bdevperf.sh $TEST_ARGS run_test suite test/nvmf/host/bdevperf.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/host/identify.sh $TEST_ARGS run_test suite test/nvmf/host/identify.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/host/perf.sh $TEST_ARGS run_test suite test/nvmf/host/perf.sh "${TEST_ARGS[@]}"
# TODO: disabled due to intermittent failures (RDMA_CM_EVENT_UNREACHABLE/ETIMEDOUT) # TODO: disabled due to intermittent failures (RDMA_CM_EVENT_UNREACHABLE/ETIMEDOUT)
#run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS #run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS
run_test suite test/nvmf/host/aer.sh $TEST_ARGS run_test suite test/nvmf/host/aer.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/host/fio.sh $TEST_ARGS run_test suite test/nvmf/host/fio.sh "${TEST_ARGS[@]}"
run_test suite test/nvmf/host/target_disconnect.sh $TEST_ARGS run_test suite test/nvmf/host/target_disconnect.sh "${TEST_ARGS[@]}"
timing_exit host timing_exit host

2
test/ocf/integrity/bdevperf-iotypes.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh

2
test/ocf/integrity/fio-modes.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
plugindir=$rootdir/examples/bdev/fio_plugin plugindir=$rootdir/examples/bdev/fio_plugin

2
test/ocf/integrity/stats.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh

2
test/ocf/management/create-destruct.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh

2
test/ocf/management/multicore.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh

2
test/ocf/management/persistent-metadata.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/scripts/common.sh source $rootdir/scripts/common.sh
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh

2
test/ocf/management/remove.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
curdir=$(dirname $(readlink -f "$BASH_SOURCE")) curdir=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
rootdir=$(readlink -f $curdir/../../..) rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh