test: remove duplicated set -ex from tests

It's always set in autotest_common.sh, there's no need
to set it again in each test script.

Change-Id: Ib14c4189c553dad54a3065c1a1d413a5fc5a5347
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457466
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

autotest.sh

@@ -13,8 +13,6 @@ source "$1"
 source "$rootdir/test/common/autotest_common.sh"
 source "$rootdir/test/nvmf/common.sh"
 
-set -xe
-
 if [ $EUID -ne 0 ]; then
 	echo "$0 must be run as root"
 	exit 1

test/bdev/bdev_raid.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 rpc_server=/var/tmp/spdk-raid.sock

test/bdev/blockdev.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
+source $rootdir/test/common/autotest_common.sh
+source $testdir/nbd_common.sh
+
 rpc_py="$rootdir/scripts/rpc.py"
 
 function run_fio()
@@ -17,9 +18,6 @@ function run_fio()
 	fi
 }
 
-source $rootdir/test/common/autotest_common.sh
-source $testdir/nbd_common.sh
-
 function nbd_function_test() {
 	if [ $(uname -s) = Linux ] && modprobe -n nbd; then
 		local rpc_server=/var/tmp/spdk-nbd.sock

test/blobfs/rocksdb/rocksdb.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-set -ex
+testdir=$(readlink -f $(dirname $0))
+rootdir=$(readlink -f $testdir/../../..)
+source $rootdir/test/common/autotest_common.sh
 
 run_step() {
 	if [ -z "$1" ]; then
@@ -25,10 +27,6 @@ run_bsdump() {
 	$rootdir/examples/blob/cli/blobcli -c $ROCKSDB_CONF -b Nvme0n1 -D &> bsdump.txt
 }
 
-testdir=$(readlink -f $(dirname $0))
-rootdir=$(readlink -f $testdir/../../..)
-source $rootdir/test/common/autotest_common.sh
-
 # In the autotest job, we copy the rocksdb source to just outside the spdk directory.
 DB_BENCH_DIR="$rootdir/../rocksdb"
 DB_BENCH=$DB_BENCH_DIR/db_bench

test/blobstore/blob_io_wait/blob_io_wait.sh

@@ -11,7 +11,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 rpc_py="$rootdir/scripts/rpc.py"
-set -e
 
 timing_enter blob_bdev_io_wait
 

test/blobstore/blobstore.sh

@@ -6,14 +6,11 @@ if [ $SYSTEM = "FreeBSD" ] ; then
     exit 0
 fi
 
-set -xe
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
-timing_enter blobstore
 
-set -e
+timing_enter blobstore
 
 # Nvme0 target configuration
 $rootdir/scripts/gen_nvme.sh > $testdir/blobcli.conf

test/env/env.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh

test/ftl/bdevperf.sh

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-
 source $rootdir/test/common/autotest_common.sh
 
 tests=('-q 1 -w randwrite -t 4 -o 69632' '-q 128 -w randwrite -t 4 -o 4096' '-q 128 -w verify -t 4 -o 4096')

test/ftl/fio.sh

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-
 source $rootdir/test/common/autotest_common.sh
 
 declare -A suite

test/ftl/ftl.sh

@@ -1,13 +1,11 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-rpc_py=$rootdir/scripts/rpc.py
-
 source $rootdir/test/common/autotest_common.sh
 
+rpc_py=$rootdir/scripts/rpc.py
+
 function at_ftl_exit() {
 	# restore original driver
 	PCI_WHITELIST="$device" PCI_BLACKLIST="" DRIVER_OVERRIDE="$ocssd_original_dirver" ./scripts/setup.sh

test/ftl/json.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
+source $rootdir/test/common/autotest_common.sh
+
 rpc_py=$rootdir/scripts/rpc.py
 
-source $rootdir/test/common/autotest_common.sh
 
 device=$1
 FTL_BDEV_CONF=$testdir/config/ftl.json

test/ftl/restore.sh

@@ -1,13 +1,11 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-rpc_py=$rootdir/scripts/rpc.py
-
 source $rootdir/test/common/autotest_common.sh
 
+rpc_py=$rootdir/scripts/rpc.py
+
 mount_dir=$(mktemp -d)
 device=$1
 uuid=$2

test/ioat/ioat.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -xe
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh

test/iscsi_tgt/multiconnection/multiconnection.sh

@@ -34,7 +34,6 @@ function remove_backends() {
 	return 0
 }
 
-set -e
 timing_enter multiconnection
 
 timing_enter start_iscsi_tgt

test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/iscsi_tgt/perf/iscsi_target.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/iscsi_tgt/reset/reset.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -xe
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/json_config/json_config.sh

@@ -1,14 +1,10 @@
 #!/usr/bin/env bash
 
-set -e
-
 rootdir=$(readlink -f $(dirname $0)/../..)
 SPDK_AUTOTEST_X=false
 source "$rootdir/test/common/autotest_common.sh"
 source "$rootdir/test/nvmf/common.sh"
 
-set -x
-
 if [[ $SPDK_TEST_ISCSI -eq 1 ]]; then
 	source "$rootdir/test/iscsi_tgt/common.sh"
 fi
@@ -19,8 +15,6 @@ if [[ $SPDK_TEST_VHOST -ne 1 && $SPDK_TEST_VHOST_INIT -eq 1 ]]; then
 	echo "         Setting SPDK_TEST_VHOST=1 for duration of current script."
 fi
 
-set -x
-
 if (( SPDK_TEST_BLOCKDEV + \
 		SPDK_TEST_ISCSI +
 		SPDK_TEST_NVMF +
@@ -113,7 +107,6 @@ function json_config_test_start_app() {
 
 	[[ ! -z "${#app_socket[$app]}" ]] # Check app type
 	[[ -z "${app_pid[$app]}" ]] # Assert if app is not running
-	set -x
 
 	local app_extra_params=""
 	if [[ $SPDK_TEST_VHOST -eq 1 || $SPDK_TEST_VHOST_INIT -eq 1 ]]; then

test/lvol/lvol.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh

test/nvme/hotplug.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -xe
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh

test/nvme/nvme.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/scripts/common.sh

test/nvme/spdk_nvme_cli.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -ex
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/scripts/common.sh

test/nvmf/host/aer.sh

@@ -7,8 +7,6 @@ source $rootdir/test/nvmf/common.sh
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter aer
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/host/bdevperf.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 nvmftestinit
 
 timing_enter bdevperf

test/nvmf/host/fio.sh

@@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 nvmftestinit
 
 if [ ! -d /usr/src/fio ]; then

test/nvmf/host/identify.sh

@@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
 nvmftestinit
 
 timing_enter identify

test/nvmf/host/identify_kernel_nvmf.sh

@@ -5,7 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/nvmf/common.sh
 
-set -e
 nvmftestinit
 
 timing_enter identify_kernel_nvmf_tgt

test/nvmf/host/perf.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter perf
 
 nvmftestinit

test/nvmf/target/bdev_io_wait.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter bdev_io_wait
 nvmftestinit
 nvmfappstart "-m 0xF --wait-for-rpc"

test/nvmf/target/bdevio.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter bdevio
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/connect_disconnect.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 # connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs.
 timing_enter connect_disconnect
 

test/nvmf/target/create_transport.sh

@@ -10,8 +10,6 @@ NULL_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 if ! hash nvme; then
 	echo "nvme command not found; skipping create transport test"
 	exit 0

test/nvmf/target/discovery.sh

@@ -10,8 +10,6 @@ NULL_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 if ! hash nvme; then
 	echo "nvme command not found; skipping discovery test"
 	exit 0

test/nvmf/target/filesystem.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter fs_test
 
 nvmftestinit

test/nvmf/target/fio.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter fio
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/multiconnection.sh

@@ -12,8 +12,6 @@ NVMF_SUBSYS=11
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter multiconnection
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/nmic.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter nmic
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/nvme_cli.sh

@@ -17,8 +17,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter nvme_cli
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/nvmf_lvol.sh

@@ -12,8 +12,6 @@ LVOL_BDEV_FINAL_SIZE=30
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter lvol_integrity
 nvmftestinit
 nvmfappstart "-m 0x7"

test/nvmf/target/nvmf_vhost.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
 testdir=$(readlink -f $(dirname $0))
 rootdir=$testdir/../../..
 source $rootdir/test/common/autotest_common.sh

test/nvmf/target/rpc.sh

@@ -7,8 +7,6 @@ source $rootdir/test/nvmf/common.sh
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter rpc
 nvmftestinit
 nvmfappstart "-m 0xF"

test/nvmf/target/shutdown.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 function waitforio() {
 	# $1 = RPC socket
 	if [ -z "$1" ]; then

test/nvmf/target/srq_overwhelm.sh

@@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="$rootdir/scripts/rpc.py"
 
-set -e
-
 timing_enter srq_overwhelm
 nvmftestinit
 

test/rpc_client/rpc_client.sh

@@ -2,9 +2,6 @@
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-
-set -e
-
 source $rootdir/test/common/autotest_common.sh
 
 timing_enter rpc_client

test/spdkcli/common.sh

@@ -1,5 +1,3 @@
-set -xe
-
 testdir=$(readlink -f $(dirname $0))
 SPDKCLI_BUILD_DIR=$(readlink -f $testdir/../..)
 spdkcli_job="$SPDKCLI_BUILD_DIR/test/spdkcli/spdkcli_job.py"

test/vhost/common.sh

@@ -1,5 +1,3 @@
-set -e
-
 : ${SPDK_VHOST_VERBOSE=false}
 : ${QEMU_PREFIX="/usr/local/qemu/spdk-3.0.0"}
 

test/vhost/fiotest/fio.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/hotplug/scsi_hotattach.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/hotplug/scsi_hotdetach.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/vhost/hotplug/scsi_hotplug.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/initiator/blockdev.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/vhost/integrity/integrity_start.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/lvol/lvol_test.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/manual.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
+
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vhost/common.sh
 
-set -e
-
 DEFAULT_VM_IMAGE="/home/sys_sgsw/vhost_vm_image.qcow2"
 CENTOS_VM_IMAGE="/home/sys_sgsw/spdk_vhost_CentOS_vm_image.qcow2"
 DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"

test/vhost/migration/migration.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/vhost/perf_bench/vhost_perf.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/readonly/readonly.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/vhost/shared/shared.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh

test/vhost/windows/windows.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)

test/vhost/windows/windows_scsi_compliance.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -e
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vhost/common.sh
+
 # Tested with windows vm with OS Name: Microsoft Windows Server 2012 R2 Datacenter
 # and OS Version: 6.3.9600 N/A Build 9600
 # In order to run this test with windows vm