diff --git a/scripts/check_format.sh b/scripts/check_format.sh index 17c0ac815..611052a6d 100755 --- a/scripts/check_format.sh +++ b/scripts/check_format.sh @@ -243,7 +243,7 @@ if hash shellcheck 2>/dev/null; then SHCK_EXCLUDE="SC1001,SC1003,\ SC1083,SC1113,SC2001,SC2002,SC2003,SC2004,SC2005,\ SC2010,SC2012,SC2013,SC2016,\ -SC2034,SC2043,SC2044,SC2045,SC2046,\ +SC2034,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,\ diff --git a/test/vhost/hotplug/scsi_hotdetach.sh b/test/vhost/hotplug/scsi_hotdetach.sh index 8a6d907b9..44229a6b9 100755 --- a/test/vhost/hotplug/scsi_hotdetach.sh +++ b/test/vhost/hotplug/scsi_hotdetach.sh @@ -36,30 +36,6 @@ function prepare_fio_cmd_tc1_iter1() { done } -function prepare_fio_cmd_tc1_iter2() { - print_test_fio_header - - for vm_num in 2; do - cp $fio_job $tmp_detach_job - vm_dir=$VM_DIR/$vm_num - vm_check_scsi_location $vm_num - for disk in $SCSI_DISK; do - echo "[nvme-host$disk]" >> $tmp_detach_job - echo "filename=/dev/$disk" >> $tmp_detach_job - done - vm_scp "$vm_num" $tmp_detach_job 127.0.0.1:/root/default_integrity_3discs.job - rm $tmp_detach_job - done - run_fio="$fio_bin --eta=never " - for vm_num in $used_vms; do - if [ $vm_num == 2 ]; then - run_fio+="--client=127.0.0.1,$(vm_fio_socket $vm_num) --remote-config /root/default_integrity_3discs.job " - continue - fi - run_fio+="--client=127.0.0.1,$(vm_fio_socket $vm_num) --remote-config /root/default_integrity_4discs.job " - done -} - function prepare_fio_cmd_tc2_iter1() { print_test_fio_header