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>
This commit is contained in:
Darek Stojaczyk 2019-06-10 09:16:46 +02:00
parent ef33878dd5
commit 887aff4d09
60 changed files with 15 additions and 127 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

2
test/env/env.sh vendored
View File

@ -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

View File

@ -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')

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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"

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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"

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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"

View File

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

View File

@ -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"

View File

@ -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

View File

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

View File

@ -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

View File

@ -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"

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

@ -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"

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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