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

test: Shellcheck - correct rule: Use find...

Browse Source 
Correct shellcheck rule SC2012: Use find instead of ls to better handle non-alphanumeric filenames

Change-Id: Ibfc54ac06ae4cecadd22954159d259295f99912f
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475712
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>
This commit is contained in:
Maciej Wawryk 2019-11-25 12:44:31 +01:00 committed by Tomasz Zawadzki
parent fdc82d3bc8
commit a69df7ea94
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.sh
View File

@ -134,7 +134,7 @@ timing_enter make_uninstall
# Create empty file to check if it is not deleted by target uninstall # Create empty file to check if it is not deleted by target uninstall
touch /tmp/spdk/usr/lib/sample_xyz.a touch /tmp/spdk/usr/lib/sample_xyz.a
$MAKE $MAKEFLAGS uninstall DESTDIR=/tmp/spdk prefix=/usr $MAKE $MAKEFLAGS uninstall DESTDIR=/tmp/spdk prefix=/usr
if [[ $(ls -A /tmp/spdk/usr | wc -l) -ne 2 ]] || [[ $(ls -A /tmp/spdk/usr/lib/ | wc -l) -ne 1 ]]; then if [[ $(find /tmp/spdk/usr -maxdepth 1 -mindepth 1 | wc -l) -ne 2 ]] || [[ $(find /tmp/spdk/usr/lib/ -maxdepth 1 -mindepth 1 | wc -l) -ne 1 ]]; then
ls -lR /tmp/spdk ls -lR /tmp/spdk
rm -rf /tmp/spdk rm -rf /tmp/spdk
echo "Make uninstall failed" echo "Make uninstall failed"

2
scripts/check_format.sh
View File

@ -241,7 +241,7 @@ if hash shellcheck 2>/dev/null; then
# Error descriptions can also be found at: https://github.com/koalaman/shellcheck/wiki # Error descriptions can also be found at: https://github.com/koalaman/shellcheck/wiki
# 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,SC2086,SC2089,SC2090,\ SC2010,SC2016,SC2034,SC2045,SC2046,SC2086,SC2089,SC2090,\
SC2097,SC2098,SC2119,SC2120" 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

4
test/vhost/perf_bench/vhost_perf.sh
View File

@ -96,7 +96,7 @@ function cleanup_split_cfg()
function cleanup_parted_config() function cleanup_parted_config()
{ {
local disks local disks
disks=$(ls /dev/nvme*n1 | sort --version-sort) disks=$(find /dev/ -maxdepth 1 -name 'nvme*n1' | sort --version-sort)
for disk in $disks; do for disk in $disks; do
parted -s $disk rm 1 parted -s $disk rm 1
done done
@ -226,7 +226,7 @@ if [[ "$ctrl_type" == "kernel_vhost" ]]; then
# Prepare kernel vhost configuration # Prepare kernel vhost configuration
# Below grep: match only NVMe partitions which are not "Extended" type. # Below grep: match only NVMe partitions which are not "Extended" type.
# For example: will match nvme0n1p15 but not nvme0n1p1 # For example: will match nvme0n1p15 but not nvme0n1p1
partitions=$(ls -1 /dev/nvme* | sort --version-sort | grep -P 'p(?!1$)\d+') partitions=$(find /dev/ -maxdepth 1 -name 'nvme*' | sort --version-sort | grep -P 'p(?!1$)\d+')
backstores=() backstores=()
# Create block backstores for vhost kernel process # Create block backstores for vhost kernel process