d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: Shellcheck - apply rule SC2181

Browse Source 
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: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468363
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: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Pawel Kaminski 2019-09-13 10:40:15 -04:00 committed by Tomasz Zawadzki
parent 418992173b
commit 7f0efebdf3
7 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/check_format.sh
View File

@ -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

3
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -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

6
test/nvmf/common.sh
View File

@ -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

4
test/pmem/common.sh
View File

@ -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

15
test/pmem/pmem.sh
View File

@ -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

12
test/vhost/readonly/enabled_readonly_vm.sh
View File

@ -31,27 +31,23 @@ if [[ ! -b "/dev/$disk_name"1"" ]]; then
error "Partition not found!"
fi
mkdir $testdir/$test_folder_name
if [[ $? != 0 ]]; then
if ! mkdir $testdir/$test_folder_name; then
error "Failed to create test folder $test_folder_name"
fi
echo "INFO: Mounting partition"
mount /dev/$disk_name"1" $testdir/$test_folder_name
if [[ $? != 0 ]]; then
if ! mount /dev/$disk_name"1" $testdir/$test_folder_name; then
error "Failed to mount partition $disk_name""1"
fi
echo "INFO: Trying to create file on readonly disk"
truncate -s "200M" $test_folder_name/$test_file_name"_on_readonly"
if [[ $? == 0 ]]; then
if truncate -s "200M" $test_folder_name/$test_file_name"_on_readonly"; then
error "Created a file on a readonly disk!"
fi
if [[ -f $test_folder_name/$test_file_name ]]; then
echo "INFO: Trying to delete previously created file"
rm $test_folder_name/$test_file_name
if [[ $? == 0 ]]; then
if rm $test_folder_name/$test_file_name; then
error "Deleted a file from a readonly disk!"
fi
else

3
test/vhost/readonly/readonly.sh
View File

@ -69,8 +69,7 @@ function blk_ro_tc1()
local vm_dir="$VHOST_DIR/vms/$vm_no"
if [[ $disk =~ .*malloc.* ]]; then
disk_name=$($rpc_py bdev_malloc_create 512 4096)
if [ $? != 0 ]; then
if ! disk_name=$($rpc_py bdev_malloc_create 512 4096); then
fail "Failed to create malloc bdev"
fi