test: Shellcheck - correct rule "backslash+linefeed is literal"
Correct shellcheck rule SC1004: This backslash+linefeed is literal. Break outside single quotes if you just want to break the line. Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com> Change-Id: I7b872fa3c66685c1e8e7989f7b3b74a9e4f35325 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468467 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
parent
bebda9fb40
commit
6956b0ec1e
@ -239,7 +239,7 @@ if hash shellcheck 2>/dev/null; then
|
||||
# For more information about the topic and a list of human-friendly error descripions
|
||||
# go to: https://trello.com/c/29Z90j1W
|
||||
# Error descriptions can also be found at: https://github.com/koalaman/shellcheck/wiki
|
||||
SHCK_EXCLUDE="SC1001,SC1003,SC1004,SC1010,\
|
||||
SHCK_EXCLUDE="SC1001,SC1003,SC1010,\
|
||||
SC1083,SC1090,SC1091,SC1113,SC2001,SC2002,SC2003,SC2004,SC2005,\
|
||||
SC2010,SC2012,SC2013,SC2015,SC2016,SC2018,SC2019,SC2022,\
|
||||
SC2027,SC2030,SC2031,SC2034,SC2035,SC2039,SC2043,SC2044,SC2045,SC2046,\
|
||||
|
@ -44,7 +44,7 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
|
||||
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
|
||||
waitforiscsidevices 1
|
||||
|
||||
trap 'for new_dir in $(dir -d /mnt/*dir); do umount $new_dir; rm -rf $new_dir; done; \
|
||||
trap 'for new_dir in $(dir -d /mnt/*dir); do umount $new_dir; rm -rf $new_dir; done;
|
||||
iscsicleanup; killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
echo "Test error injection"
|
||||
|
@ -77,7 +77,7 @@ timing_enter start_iscsi_tgt
|
||||
|
||||
run_nvme_remote "local"
|
||||
|
||||
trap 'iscsicleanup; killprocess $iscsipid; \
|
||||
trap 'iscsicleanup; killprocess $iscsipid;
|
||||
rm -f ./local-job0-0-verify.state; iscsitestfini $1 $2; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
echo "Running FIO"
|
||||
|
@ -980,13 +980,13 @@ function vm_start_fio_server()
|
||||
function vm_check_scsi_location()
|
||||
{
|
||||
# Script to find wanted disc
|
||||
local script='shopt -s nullglob; \
|
||||
for entry in /sys/block/sd*; do \
|
||||
disk_type="$(cat $entry/device/vendor)"; \
|
||||
if [[ $disk_type == INTEL* ]] || [[ $disk_type == RAWSCSI* ]] || [[ $disk_type == LIO-ORG* ]]; then \
|
||||
fname=$(basename $entry); \
|
||||
echo -n " $fname"; \
|
||||
fi; \
|
||||
local script='shopt -s nullglob;
|
||||
for entry in /sys/block/sd*; do
|
||||
disk_type="$(cat $entry/device/vendor)";
|
||||
if [[ $disk_type == INTEL* ]] || [[ $disk_type == RAWSCSI* ]] || [[ $disk_type == LIO-ORG* ]]; then
|
||||
fname=$(basename $entry);
|
||||
echo -n " $fname";
|
||||
fi;
|
||||
done'
|
||||
|
||||
SCSI_DISK="$(echo "$script" | vm_exec $1 bash -s)"
|
||||
|
@ -48,8 +48,8 @@ if [[ $EUID -ne 0 ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
trap 'rm -f *.state $rootdir/spdk.tar.gz $rootdir/fio.tar.gz $(get_vhost_dir)/Virtio0;\
|
||||
error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT
|
||||
trap 'rm -f *.state $rootdir/spdk.tar.gz $rootdir/fio.tar.gz $(get_vhost_dir)/Virtio0;
|
||||
error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT
|
||||
|
||||
function run_spdk_fio() {
|
||||
fio_bdev --ioengine=spdk_bdev "$@" --spdk_mem=1024 --spdk_single_seg=1
|
||||
|
Loading…
x
Reference in New Issue
Block a user