Commit 887aff4d authored by Darek Stojaczyk's avatar Darek Stojaczyk
Browse files

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: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457466


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent ef33878d

autotest.sh

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line 
#!/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

+3 −5
Original line number Diff line number Diff line 
#!/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

+3 −5
Original line number Diff line number Diff line 
#!/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

+0 −1
Original line number Diff line number Diff line
@@ -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