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

test: Shellcheck - correct rule: Useless echo

Browse Source 
Correct shellcheck rule SC2005: Useless echo?
Instead of echo $(cmd), just use cmd

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I60c05915691a339cced6d4e3694514857b2d1c4e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/470899
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Maciej Wawryk 2019-10-10 07:37:35 +02:00 committed by Jim Harris
parent f1131f1d19
commit 4b3a6e876c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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="SC1001,SC1003,\ SHCK_EXCLUDE="SC1001,SC1003,\
SC1083,SC1113,SC2001,SC2002,SC2003,SC2004,SC2005,\ SC1083,SC1113,SC2001,SC2002,SC2003,SC2004,\
SC2010,SC2012,SC2013,SC2016,\ SC2010,SC2012,SC2013,SC2016,\
SC2034,SC2045,SC2046,\ SC2034,SC2045,SC2046,\
SC2068,SC2086,SC2089,SC2090,\ SC2068,SC2086,SC2089,SC2090,\

4
test/ftl/common.sh
View File

@ -1,8 +1,8 @@
# Common utility functions to be sourced by the libftl test scripts # Common utility functions to be sourced by the libftl test scripts
function get_chunk_size() { function get_chunk_size() {
echo $($rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:$1" | \ $rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:$1" |
grep 'Logical blks per chunk' | sed 's/[^0-9]//g') grep 'Logical blks per chunk' | sed 's/[^0-9]//g'
} }
function has_separate_md() { function has_separate_md() {

12
test/nvme/perf/common.sh
View File

@ -43,7 +43,7 @@ function get_cores(){
function get_cores_numa_node(){ function get_cores_numa_node(){
local cores=$1 local cores=$1
for core in $cores; do for core in $cores; do
echo $(lscpu -p=cpu,node | grep "^$core\b" | awk -F ',' '{print $2}') lscpu -p=cpu,node | grep "^$core\b" | awk -F ',' '{print $2}'
done done
} }
@ -55,20 +55,20 @@ function get_numa_node(){
local driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent |awk -F"=" '{print $2}') local driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent |awk -F"=" '{print $2}')
# Use this check to ommit blacklisted devices ( not binded to driver with setup.sh script ) # Use this check to ommit blacklisted devices ( not binded to driver with setup.sh script )
if [ "$driver" = "vfio-pci" ] || [ "$driver" = "uio_pci_generic" ]; then if [ "$driver" = "vfio-pci" ] || [ "$driver" = "uio_pci_generic" ]; then
echo $(cat /sys/bus/pci/devices/$bdf/numa_node) cat /sys/bus/pci/devices/$bdf/numa_node
fi fi
done done
elif [ "$plugin" = "bdev" ] || [ "$plugin" = "bdevperf" ]; then elif [ "$plugin" = "bdev" ] || [ "$plugin" = "bdevperf" ]; then
local bdevs=$(discover_bdevs $ROOT_DIR $BASE_DIR/bdev.conf) local bdevs=$(discover_bdevs $ROOT_DIR $BASE_DIR/bdev.conf)
for name in $disks; do for name in $disks; do
local bdev_bdf=$(jq -r ".[] | select(.name==\"$name\").driver_specific.nvme.pci_address" <<< $bdevs) local bdev_bdf=$(jq -r ".[] | select(.name==\"$name\").driver_specific.nvme.pci_address" <<< $bdevs)
echo $(cat /sys/bus/pci/devices/$bdev_bdf/numa_node) cat /sys/bus/pci/devices/$bdev_bdf/numa_node
done done
else else
# Only target not mounted NVMes # Only target not mounted NVMes
for bdf in $(iter_pci_class_code 01 08 02); do for bdf in $(iter_pci_class_code 01 08 02); do
if is_bdf_not_mounted $bdf; then if is_bdf_not_mounted $bdf; then
echo $(cat /sys/bus/pci/devices/$bdf/numa_node) cat /sys/bus/pci/devices/$bdf/numa_node
fi fi
done done
fi fi
@ -85,7 +85,7 @@ function get_disks(){
done done
elif [ "$plugin" = "bdev" ] || [ "$plugin" = "bdevperf" ]; then elif [ "$plugin" = "bdev" ] || [ "$plugin" = "bdevperf" ]; then
local bdevs=$(discover_bdevs $ROOT_DIR $BASE_DIR/bdev.conf) local bdevs=$(discover_bdevs $ROOT_DIR $BASE_DIR/bdev.conf)
echo $(jq -r '.[].name' <<< $bdevs) jq -r '.[].name' <<< $bdevs
else else
# Only target not mounted NVMes # Only target not mounted NVMes
for bdf in $(iter_pci_class_code 01 08 02); do for bdf in $(iter_pci_class_code 01 08 02); do
@ -297,7 +297,7 @@ function run_nvme_fio(){
function run_bdevperf(){ function run_bdevperf(){
echo "** Running bdevperf test, this can take a while, depending on the run-time setting." echo "** Running bdevperf test, this can take a while, depending on the run-time setting."
echo $($BDEVPERF_DIR/bdevperf -c $BASE_DIR/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME) $BDEVPERF_DIR/bdevperf -c $BASE_DIR/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME
sleep 1 sleep 1
} }