Commit 7f0efebd authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Tomasz Zawadzki
Browse files

test: Shellcheck - apply rule SC2181 



Check exit code directly with e.g. 'if mycmd;',
not indirectly with $?.

Rule disabled in test/pmem/common.sh as behaviour
may differ depends on bash version

Change-Id: Ied4c5dfb09e52c5db08becf1ad69a29a1bda426b
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468363


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 41899217

scripts/check_format.sh

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ SC2027,SC2030,SC2031,SC2034,SC2035,SC2039,SC2043,SC2044,SC2045,SC2046,\ 
SC2068,SC2086,SC2089,SC2090,\

SC2097,SC2098,SC2103,SC2115,SC2116,SC2119,SC2120,SC2121,SC2124,SC2126,SC2128,\

SC2129,SC2140,SC2142,SC2143,SC2145,SC2146,SC2148,SC2152,SC2153,SC2154,SC2155,\

SC2162,SC2164,SC2165,SC2166,SC2167,SC2174,SC2178,SC2181,\

SC2162,SC2164,SC2165,SC2166,SC2167,SC2174,SC2178,\

SC2206,SC2207,SC2214,SC2223,SC2230,SC2231"

	# 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

test/iscsi_tgt/ext4test/ext4test.sh

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}') 


set +e

waitforfile /dev/$dev

mkfs.ext4 -F /dev/$dev

if [ $? -eq 0 ]; then

if mkfs.ext4 -F /dev/$dev; then

	echo "mkfs successful - expected failure"

	iscsicleanup

	killprocess $pid

test/nvmf/common.sh

+2 −4
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ function nvmfcleanup() 
	set +e

	for i in {1..20}; do

		modprobe -v -r nvme-$TEST_TRANSPORT

		modprobe -v -r nvme-fabrics

		if [ $? -eq 0 ]; then

		if modprobe -v -r nvme-fabrics; then

			set -e

			return

		fi
@@ -260,8 +259,7 @@ function nvme_connect() 
{

	local init_count=$(nvme list | wc -l)



	nvme connect $@

	if [ $? != 0 ]; then return $?; fi

	if ! nvme connect $@; then return $?; fi



	for i in $(seq 1 10); do

		if [ $(nvme list | wc -l) -gt $init_count ]; then

test/pmem/common.sh

+0 −4
Original line number Diff line number Diff line
@@ -70,10 +70,6 @@ function vhost_start() 
	local vhost_pid



	$rootdir/app/vhost/vhost &

	if [ $? != 0 ]; then

		echo -e "ERROR: Failed to launch vhost!"

		return 1

	fi



	vhost_pid=$!

	echo $vhost_pid > $testdir/vhost.pid

test/pmem/pmem.sh

+5 −10
Original line number Diff line number Diff line
@@ -292,8 +292,7 @@ function bdev_pmem_create_pool_tc6() 
			error "Failed to create pmem pool!"

		fi



		created_pmem_block_size=$($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .block_size')

		if [ $? != 0 ]; then

		if ! created_pmem_block_size=$($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .block_size'); then

			error "Failed to get pmem info!"

		fi
@@ -524,8 +523,7 @@ function bdev_pmem_create_tc5() 
		error "Failed to get pmem info!"

	fi



	pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file)

	if [ $? != 0 ]; then

	if ! pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file); then

		error "Failed to create pmem bdev"

	fi
@@ -556,8 +554,7 @@ function bdev_pmem_create_tc6() 
		error "Failed to get info on pmem pool file!"

	fi



	pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file)

	if [ $? != 0 ]; then

	if ! pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file); then

		error "Failed to create pmem bdev!"

	fi
@@ -596,8 +593,7 @@ function delete_bdev_tc1() 
		error "Failed to get pmem info!"

	fi



	pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file)

	if [ $? != 0 ]; then

	if ! pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file); then

		error "Failed to create pmem bdev!"

	fi
@@ -629,8 +625,7 @@ function delete_bdev_tc2() 
		error "Failed to get pmem info!"

	fi



	pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file)

	if [ $? != 0 ]; then

	if ! pmem_bdev_name=$($rpc_py bdev_pmem_create -n $bdev_name $default_pool_file); then

		error "Failed to create pmem bdev"

	fi