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 <seth.howell@intel.com> Reviewed-on: https://review.gerrithub.io/401707 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2018-02-27 15:14:08 -07:00 · 2018-02-27 15:14:08 -07:00 · c9e5d2a6d0
commit c9e5d2a6d0
parent d1165a6539
48 changed files with 48 additions and 48 deletions
--- 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

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

--- 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
--- 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
--- 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
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
--- 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.
--- 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
--- 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()
--- 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
--- 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
--- 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() {
--- 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"
--- 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
--- 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
--- 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"
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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() {
--- 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

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

--- 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 "$@"
--- 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
--- 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()
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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

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

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