From c9e5d2a6d0a086a7646c841bdef400d59c4d2498 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 27 Feb 2018 15:14:08 -0700 Subject: [PATCH] autotest_common.sh: move to test/common This is the first step in reorganizing the spdk test heirarchy. Change-Id: I83467653af2da2a53251649092bed6902d6cb86e Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/401707 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- autobuild.sh | 2 +- autopackage.sh | 2 +- autotest.sh | 2 +- test/blobfs/rocksdb/rocksdb.sh | 2 +- test/blobstore/blobstore.sh | 2 +- {scripts => test/common}/autotest_common.sh | 0 test/config/README.md | 2 +- test/iscsi_tgt/calsoft/calsoft.sh | 2 +- test/iscsi_tgt/digests/digests.sh | 2 +- test/iscsi_tgt/ext4test/ext4test.sh | 2 +- test/iscsi_tgt/filesystem/filesystem.sh | 2 +- test/iscsi_tgt/fio/fio.sh | 2 +- test/iscsi_tgt/ip_migration/ip_migration.sh | 2 +- test/iscsi_tgt/iscsi_tgt.sh | 2 +- test/iscsi_tgt/lvol/iscsi_lvol.sh | 2 +- test/iscsi_tgt/multiconnection/multiconnection.sh | 2 +- test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh | 2 +- test/iscsi_tgt/pmem/iscsi_pmem.sh | 2 +- test/iscsi_tgt/rbd/rbd.sh | 2 +- test/iscsi_tgt/reset/reset.sh | 2 +- test/iscsi_tgt/rpc_config/rpc_config.sh | 2 +- test/lib/bdev/blockdev.sh | 2 +- test/lib/env/env.sh | 2 +- test/lib/event/event.sh | 2 +- test/lib/ioat/ioat.sh | 2 +- test/lib/nvme/hotplug.sh | 2 +- test/lib/nvme/nvme.sh | 2 +- test/lvol/lvol.sh | 2 +- test/nvmf/discovery/discovery.sh | 2 +- test/nvmf/filesystem/filesystem.sh | 2 +- test/nvmf/fio/fio.sh | 2 +- test/nvmf/host/aer.sh | 2 +- test/nvmf/host/bdevperf.sh | 2 +- test/nvmf/host/fio.sh | 2 +- test/nvmf/host/identify.sh | 2 +- test/nvmf/host/identify_kernel_nvmf.sh | 2 +- test/nvmf/host/perf.sh | 2 +- test/nvmf/lvol/nvmf_lvol.sh | 2 +- test/nvmf/multiconnection/multiconnection.sh | 2 +- test/nvmf/nvme_cli/nvme_cli.sh | 2 +- test/nvmf/nvmf.sh | 2 +- test/nvmf/pmem/nvmf_pmem.sh | 2 +- test/nvmf/rpc/rpc.sh | 2 +- test/nvmf/shutdown/shutdown.sh | 2 +- test/pmem/common.sh | 2 +- test/vhost/common/common.sh | 4 ++-- test/vhost/initiator/blockdev.sh | 2 +- test/vhost/integrity/integrity_start.sh | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) rename {scripts => test/common}/autotest_common.sh (100%) diff --git a/autobuild.sh b/autobuild.sh index 168bb482f..3bfbdd0f5 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -3,7 +3,7 @@ set -e rootdir=$(readlink -f $(dirname $0)) -source "$rootdir/scripts/autotest_common.sh" +source "$rootdir/test/common/autotest_common.sh" out=$PWD diff --git a/autopackage.sh b/autopackage.sh index 35d82a35c..bc18182c4 100755 --- a/autopackage.sh +++ b/autopackage.sh @@ -3,7 +3,7 @@ set -xe rootdir=$(readlink -f $(dirname $0)) -source "$rootdir/scripts/autotest_common.sh" +source "$rootdir/test/common/autotest_common.sh" out=$PWD diff --git a/autotest.sh b/autotest.sh index 7e6d2cdcd..5964ef59b 100755 --- a/autotest.sh +++ b/autotest.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash rootdir=$(readlink -f $(dirname $0)) -source "$rootdir/scripts/autotest_common.sh" +source "$rootdir/test/common/autotest_common.sh" source "$rootdir/test/nvmf/common.sh" set -xe diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 0acdc9f21..457b41d13 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -19,7 +19,7 @@ run_step() { testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh DB_BENCH_DIR=/usr/src/rocksdb DB_BENCH=$DB_BENCH_DIR/db_bench diff --git a/test/blobstore/blobstore.sh b/test/blobstore/blobstore.sh index 30d78fff9..4ae413a1a 100755 --- a/test/blobstore/blobstore.sh +++ b/test/blobstore/blobstore.sh @@ -10,7 +10,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh timing_enter blobstore set -e diff --git a/scripts/autotest_common.sh b/test/common/autotest_common.sh similarity index 100% rename from scripts/autotest_common.sh rename to test/common/autotest_common.sh diff --git a/test/config/README.md b/test/config/README.md index b48652104..c45c8ecba 100644 --- a/test/config/README.md +++ b/test/config/README.md @@ -25,7 +25,7 @@ Every machine that runs the autotest scripts should include a file titled autoru of the user that will run them. This file consists of several lines of the form 'variable_name=0/1'. autorun.sh sources this file each time it is run, and determines which tests to attempt based on which variables are defined in the configuration file. For a full list of the variable declarations available for autorun-spdk.conf, please see -`scripts/autotest_common.sh` starting at line 13. +`test/common/autotest_common.sh` starting at line 13. ## Steps for Configuring the VM 1. Download a fresh Fedora 26 image. diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index dccd6d5e0..821c06a43 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh if [ ! -d /usr/local/calsoft ]; then diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh index a733d96cd..db3a798d9 100755 --- a/test/iscsi_tgt/digests/digests.sh +++ b/test/iscsi_tgt/digests/digests.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh function node_login_fio_logout() diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index 0ac3165dc..81d874bb8 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh if [ ! -z $1 ]; then diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh index 3247c68d2..b7b7184ea 100755 --- a/test/iscsi_tgt/filesystem/filesystem.sh +++ b/test/iscsi_tgt/filesystem/filesystem.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh timing_enter filesystem diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 953768a18..5867cb5ff 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh function running_config() { diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index c1fbd7e70..a77ae79ab 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh rpc_py="python $rootdir/scripts/rpc.py" diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh index 6128142f8..3e2e80d58 100755 --- a/test/iscsi_tgt/iscsi_tgt.sh +++ b/test/iscsi_tgt/iscsi_tgt.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh if [ ! $(uname -s) = Linux ]; then exit 0 diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh index 2adacdd05..59a364503 100755 --- a/test/iscsi_tgt/lvol/iscsi_lvol.sh +++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh @@ -5,7 +5,7 @@ export INITIATOR_IP=127.0.0.1 testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh timing_enter iscsi_lvol diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh index 585c80197..f9c588a0b 100755 --- a/test/iscsi_tgt/multiconnection/multiconnection.sh +++ b/test/iscsi_tgt/multiconnection/multiconnection.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh rpc_py="python $rootdir/scripts/rpc.py" diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 86a829598..83d1aa9a5 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -4,7 +4,7 @@ set -e testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh source $rootdir/test/iscsi_tgt/common.sh diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh index c1e40dd11..da37be6d0 100755 --- a/test/iscsi_tgt/pmem/iscsi_pmem.sh +++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh @@ -5,7 +5,7 @@ export INITIATOR_IP=127.0.0.1 testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh # iSCSI target configuration diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh index a9278c970..94fb8e91e 100755 --- a/test/iscsi_tgt/rbd/rbd.sh +++ b/test/iscsi_tgt/rbd/rbd.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh if ! hash ceph; then diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh index c842a4ae4..a0f8c348f 100755 --- a/test/iscsi_tgt/reset/reset.sh +++ b/test/iscsi_tgt/reset/reset.sh @@ -4,7 +4,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh timing_enter reset diff --git a/test/iscsi_tgt/rpc_config/rpc_config.sh b/test/iscsi_tgt/rpc_config/rpc_config.sh index 1a8a88c3d..6e29a30a3 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.sh +++ b/test/iscsi_tgt/rpc_config/rpc_config.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/iscsi_tgt/common.sh timing_enter rpc_config diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh index a2bc71b04..c39f03892 100755 --- a/test/lib/bdev/blockdev.sh +++ b/test/lib/bdev/blockdev.sh @@ -17,7 +17,7 @@ function run_fio() fi } -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $testdir/nbd_common.sh function nbd_function_test() { diff --git a/test/lib/env/env.sh b/test/lib/env/env.sh index d99be8d66..634465361 100755 --- a/test/lib/env/env.sh +++ b/test/lib/env/env.sh @@ -4,7 +4,7 @@ set -e testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh timing_enter env diff --git a/test/lib/event/event.sh b/test/lib/event/event.sh index 1c503f2b5..8d6940696 100755 --- a/test/lib/event/event.sh +++ b/test/lib/event/event.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh timing_enter event $testdir/event_perf/event_perf -m 0xF -t 1 diff --git a/test/lib/ioat/ioat.sh b/test/lib/ioat/ioat.sh index 5015b39ae..7ec5c0a72 100755 --- a/test/lib/ioat/ioat.sh +++ b/test/lib/ioat/ioat.sh @@ -4,7 +4,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh timing_enter ioat diff --git a/test/lib/nvme/hotplug.sh b/test/lib/nvme/hotplug.sh index 66986d3c5..054be5be4 100755 --- a/test/lib/nvme/hotplug.sh +++ b/test/lib/nvme/hotplug.sh @@ -4,7 +4,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh function ssh_vm() { sshpass -p "$password" ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -p 10022 root@localhost "$@" diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh index 8ab240531..bc83ee83f 100755 --- a/test/lib/nvme/nvme.sh +++ b/test/lib/nvme/nvme.sh @@ -5,7 +5,7 @@ set -e testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/common.sh -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh function get_nvme_name_from_bdf { lsblk -d --output NAME diff --git a/test/lvol/lvol.sh b/test/lvol/lvol.sh index cca766adf..18d0f3b6e 100755 --- a/test/lvol/lvol.sh +++ b/test/lvol/lvol.sh @@ -86,7 +86,7 @@ while getopts 'xh-:' optchar; do done shift $(( OPTIND - 1 )) -source $TEST_DIR/scripts/autotest_common.sh +source $TEST_DIR/test/common/autotest_common.sh ### Function starts vhost app function vhost_start() diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh index 66e0caaf4..57d6d1069 100755 --- a/test/nvmf/discovery/discovery.sh +++ b/test/nvmf/discovery/discovery.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh NULL_BDEV_SIZE=102400 diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh index 0096e42da..d3b1ba702 100755 --- a/test/nvmf/filesystem/filesystem.sh +++ b/test/nvmf/filesystem/filesystem.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh index 6b7a63e70..5dc61e053 100755 --- a/test/nvmf/fio/fio.sh +++ b/test/nvmf/fio/fio.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index b841f4190..4ce90afce 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh rpc_py="python $rootdir/scripts/rpc.py" diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh index 41bd78a18..f000a3278 100755 --- a/test/nvmf/host/bdevperf.sh +++ b/test/nvmf/host/bdevperf.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index 8c5307b07..b77e8c936 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/scripts/common.sh source $rootdir/test/nvmf/common.sh diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh index 79aa29edf..fc1b0b2b7 100755 --- a/test/nvmf/host/identify.sh +++ b/test/nvmf/host/identify.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/host/identify_kernel_nvmf.sh b/test/nvmf/host/identify_kernel_nvmf.sh index 8ae8f3496..16534e68e 100755 --- a/test/nvmf/host/identify_kernel_nvmf.sh +++ b/test/nvmf/host/identify_kernel_nvmf.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh set -e diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh index 2d38b117c..916d4eb6c 100755 --- a/test/nvmf/host/perf.sh +++ b/test/nvmf/host/perf.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/lvol/nvmf_lvol.sh index 4f141c353..78f97a18f 100755 --- a/test/nvmf/lvol/nvmf_lvol.sh +++ b/test/nvmf/lvol/nvmf_lvol.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=128 diff --git a/test/nvmf/multiconnection/multiconnection.sh b/test/nvmf/multiconnection/multiconnection.sh index 73ecd1c7c..0ecd2068b 100755 --- a/test/nvmf/multiconnection/multiconnection.sh +++ b/test/nvmf/multiconnection/multiconnection.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=128 diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index e287060d2..d1d1ce2ec 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=64 diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 1f979371d..dbcd7636d 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh if [ ! $(uname -s) = Linux ]; then exit 0 diff --git a/test/nvmf/pmem/nvmf_pmem.sh b/test/nvmf/pmem/nvmf_pmem.sh index a460f2b54..4fcefe882 100755 --- a/test/nvmf/pmem/nvmf_pmem.sh +++ b/test/nvmf/pmem/nvmf_pmem.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh RUNTIME=$1 diff --git a/test/nvmf/rpc/rpc.sh b/test/nvmf/rpc/rpc.sh index c75923e4f..1242b7930 100755 --- a/test/nvmf/rpc/rpc.sh +++ b/test/nvmf/rpc/rpc.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh rpc_py="python $rootdir/scripts/rpc.py" diff --git a/test/nvmf/shutdown/shutdown.sh b/test/nvmf/shutdown/shutdown.sh index 3550447d8..cbd6d0fc1 100755 --- a/test/nvmf/shutdown/shutdown.sh +++ b/test/nvmf/shutdown/shutdown.sh @@ -2,7 +2,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../../..) -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh MALLOC_BDEV_SIZE=128 diff --git a/test/pmem/common.sh b/test/pmem/common.sh index 5329100f7..e95a6888b 100644 --- a/test/pmem/common.sh +++ b/test/pmem/common.sh @@ -4,7 +4,7 @@ BASE_DIR=$(readlink -f $(dirname $0)) [[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $BASE_DIR/../../ && pwd)" rpc_py="$TEST_DIR/scripts/rpc.py " -source $TEST_DIR/scripts/autotest_common.sh +source $TEST_DIR/test/common/autotest_common.sh # Prints error message and return error code, closes vhost app and remove # pmem pool file diff --git a/test/vhost/common/common.sh b/test/vhost/common/common.sh index 9e66e2a12..54df976e1 100644 --- a/test/vhost/common/common.sh +++ b/test/vhost/common/common.sh @@ -77,9 +77,9 @@ source $(readlink -f $(dirname ${BASH_SOURCE[0]}))/autotest.config # Trace flag is optional, if it wasn't set earlier - disable it after sourcing # autotest_common.sh if [[ $- =~ x ]]; then - source $SPDK_BUILD_DIR/scripts/autotest_common.sh + source $SPDK_BUILD_DIR/test/common/autotest_common.sh else - source $SPDK_BUILD_DIR/scripts/autotest_common.sh + source $SPDK_BUILD_DIR/test/common/autotest_common.sh set +x fi diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index 0f343772d..93d01144b 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -126,7 +126,7 @@ vm_ssh $vm_no " cd spdk ; make clean ; ./configure --with-fio=/root/fio_src ; ma timing_exit vm_build_spdk vm_ssh $vm_no "/root/spdk/scripts/setup.sh" -vbdevs=$(vm_ssh $vm_no ". /root/spdk/scripts/autotest_common.sh && discover_bdevs /root/spdk \ +vbdevs=$(vm_ssh $vm_no ". /root/spdk/test/common/autotest_common.sh && discover_bdevs /root/spdk \ /root/spdk/test/vhost/initiator/bdev_pci.conf") virtio_bdevs=$(jq -r '[.[].name] | join(":")' <<< $vbdevs) virtio_with_unmap=$(jq -r '[.[] | select(.supported_io_types.unmap==true).name] diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 646c91ad1..013cfbeca 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -30,7 +30,7 @@ while getopts 'i:m:f:' optchar; do esac done -source $rootdir/scripts/autotest_common.sh +source $rootdir/test/common/autotest_common.sh if [ -z "$VM_IMG" ]; then echo "ERROR: VM_IMG: path to qcow2 image not provided - not running"