ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest_common.sh: move to test/common

Browse Source 
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>
This commit is contained in:
Seth Howell 2018-02-27 15:14:08 -07:00 committed by Jim Harris
parent d1165a6539
commit c9e5d2a6d0
48 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.sh
View File

@ -3,7 +3,7 @@
set -e set -e
rootdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $(dirname $0))
source "$rootdir/scripts/autotest_common.sh" source "$rootdir/test/common/autotest_common.sh"
out=$PWD out=$PWD

2
autopackage.sh
View File

@ -3,7 +3,7 @@
set -xe set -xe
rootdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $(dirname $0))
source "$rootdir/scripts/autotest_common.sh" source "$rootdir/test/common/autotest_common.sh"
out=$PWD out=$PWD

2
autotest.sh
View File

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

2
test/blobfs/rocksdb/rocksdb.sh
View File

@ -19,7 +19,7 @@ run_step() {
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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_DIR=/usr/src/rocksdb
DB_BENCH=$DB_BENCH_DIR/db_bench DB_BENCH=$DB_BENCH_DIR/db_bench

2
test/blobstore/blobstore.sh
View File

@ -10,7 +10,7 @@ set -xe
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
timing_enter blobstore timing_enter blobstore
set -e set -e

0
scripts/autotest_common.sh → test/common/autotest_common.sh
View File

2
test/config/README.md
View File

@ -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 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 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 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 ## Steps for Configuring the VM
1. Download a fresh Fedora 26 image. 1. Download a fresh Fedora 26 image.

2
test/iscsi_tgt/calsoft/calsoft.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
if [ ! -d /usr/local/calsoft ]; then if [ ! -d /usr/local/calsoft ]; then

2
test/iscsi_tgt/digests/digests.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
function node_login_fio_logout() function node_login_fio_logout()

2
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
if [ ! -z $1 ]; then if [ ! -z $1 ]; then

2
test/iscsi_tgt/filesystem/filesystem.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
timing_enter filesystem timing_enter filesystem

2
test/iscsi_tgt/fio/fio.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
function running_config() { function running_config() {

2
test/iscsi_tgt/ip_migration/ip_migration.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
rpc_py="python $rootdir/scripts/rpc.py" rpc_py="python $rootdir/scripts/rpc.py"

2
test/iscsi_tgt/iscsi_tgt.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
if [ ! $(uname -s) = Linux ]; then if [ ! $(uname -s) = Linux ]; then
exit 0 exit 0

2
test/iscsi_tgt/lvol/iscsi_lvol.sh
View File

@ -5,7 +5,7 @@ export INITIATOR_IP=127.0.0.1
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
timing_enter iscsi_lvol timing_enter iscsi_lvol

2
test/iscsi_tgt/multiconnection/multiconnection.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
rpc_py="python $rootdir/scripts/rpc.py" rpc_py="python $rootdir/scripts/rpc.py"

2
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -4,7 +4,7 @@ set -e
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh

2
test/iscsi_tgt/pmem/iscsi_pmem.sh
View File

@ -5,7 +5,7 @@ export INITIATOR_IP=127.0.0.1
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
# iSCSI target configuration # iSCSI target configuration

2
test/iscsi_tgt/rbd/rbd.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
if ! hash ceph; then if ! hash ceph; then

2
test/iscsi_tgt/reset/reset.sh
View File

@ -4,7 +4,7 @@ set -xe
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
timing_enter reset timing_enter reset

2
test/iscsi_tgt/rpc_config/rpc_config.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh source $rootdir/test/iscsi_tgt/common.sh
timing_enter rpc_config timing_enter rpc_config

2
test/lib/bdev/blockdev.sh
View File

@ -17,7 +17,7 @@ function run_fio()
fi fi
} }
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $testdir/nbd_common.sh source $testdir/nbd_common.sh
function nbd_function_test() { function nbd_function_test() {

2
test/lib/env/env.sh vendored
View File

@ -4,7 +4,7 @@ set -e
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
timing_enter env timing_enter env

2
test/lib/event/event.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
timing_enter event timing_enter event
$testdir/event_perf/event_perf -m 0xF -t 1 $testdir/event_perf/event_perf -m 0xF -t 1

2
test/lib/ioat/ioat.sh
View File

@ -4,7 +4,7 @@ set -xe
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
timing_enter ioat timing_enter ioat

2
test/lib/nvme/hotplug.sh
View File

@ -4,7 +4,7 @@ set -xe
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
function ssh_vm() { function ssh_vm() {
sshpass -p "$password" ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -p 10022 root@localhost "$@" sshpass -p "$password" ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -p 10022 root@localhost "$@"

2
test/lib/nvme/nvme.sh
View File

@ -5,7 +5,7 @@ set -e
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/common.sh source $rootdir/scripts/common.sh
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
function get_nvme_name_from_bdf { function get_nvme_name_from_bdf {
lsblk -d --output NAME lsblk -d --output NAME

2
test/lvol/lvol.sh
View File

@ -86,7 +86,7 @@ while getopts 'xh-:' optchar; do
done done
shift $(( OPTIND - 1 )) shift $(( OPTIND - 1 ))
source $TEST_DIR/scripts/autotest_common.sh source $TEST_DIR/test/common/autotest_common.sh
### Function starts vhost app ### Function starts vhost app
function vhost_start() function vhost_start()

2
test/nvmf/discovery/discovery.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
NULL_BDEV_SIZE=102400 NULL_BDEV_SIZE=102400

2
test/nvmf/filesystem/filesystem.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/fio/fio.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/host/aer.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
rpc_py="python $rootdir/scripts/rpc.py" rpc_py="python $rootdir/scripts/rpc.py"

2
test/nvmf/host/bdevperf.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/host/fio.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/scripts/common.sh source $rootdir/scripts/common.sh
source $rootdir/test/nvmf/common.sh source $rootdir/test/nvmf/common.sh

2
test/nvmf/host/identify.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/host/identify_kernel_nvmf.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
set -e set -e

2
test/nvmf/host/perf.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/lvol/nvmf_lvol.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=128 MALLOC_BDEV_SIZE=128

2
test/nvmf/multiconnection/multiconnection.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=128 MALLOC_BDEV_SIZE=128

2
test/nvmf/nvme_cli/nvme_cli.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64

2
test/nvmf/nvmf.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
if [ ! $(uname -s) = Linux ]; then if [ ! $(uname -s) = Linux ]; then
exit 0 exit 0

2
test/nvmf/pmem/nvmf_pmem.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
RUNTIME=$1 RUNTIME=$1

2
test/nvmf/rpc/rpc.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
rpc_py="python $rootdir/scripts/rpc.py" rpc_py="python $rootdir/scripts/rpc.py"

2
test/nvmf/shutdown/shutdown.sh
View File

@ -2,7 +2,7 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) 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/nvmf/common.sh
MALLOC_BDEV_SIZE=128 MALLOC_BDEV_SIZE=128

2
test/pmem/common.sh
View File

@ -4,7 +4,7 @@ BASE_DIR=$(readlink -f $(dirname $0))
[[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $BASE_DIR/../../ && pwd)" [[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $BASE_DIR/../../ && pwd)"
rpc_py="$TEST_DIR/scripts/rpc.py " 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 # Prints error message and return error code, closes vhost app and remove
# pmem pool file # pmem pool file

4
test/vhost/common/common.sh
View File

@ -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 # Trace flag is optional, if it wasn't set earlier - disable it after sourcing
# autotest_common.sh # autotest_common.sh
if [[ $- =~ x ]]; then if [[ $- =~ x ]]; then
source $SPDK_BUILD_DIR/scripts/autotest_common.sh source $SPDK_BUILD_DIR/test/common/autotest_common.sh
else else
source $SPDK_BUILD_DIR/scripts/autotest_common.sh source $SPDK_BUILD_DIR/test/common/autotest_common.sh
set +x set +x
fi fi

2
test/vhost/initiator/blockdev.sh
View File

@ -126,7 +126,7 @@ vm_ssh $vm_no " cd spdk ; make clean ; ./configure --with-fio=/root/fio_src ; ma
timing_exit vm_build_spdk timing_exit vm_build_spdk
vm_ssh $vm_no "/root/spdk/scripts/setup.sh" 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") /root/spdk/test/vhost/initiator/bdev_pci.conf")
virtio_bdevs=$(jq -r '[.[].name] | join(":")' <<< $vbdevs) virtio_bdevs=$(jq -r '[.[].name] | join(":")' <<< $vbdevs)
virtio_with_unmap=$(jq -r '[.[] | select(.supported_io_types.unmap==true).name] virtio_with_unmap=$(jq -r '[.[] | select(.supported_io_types.unmap==true).name]

2
test/vhost/integrity/integrity_start.sh
View File

@ -30,7 +30,7 @@ while getopts 'i:m:f:' optchar; do
esac esac
done done
source $rootdir/scripts/autotest_common.sh source $rootdir/test/common/autotest_common.sh
if [ -z "$VM_IMG" ]; then if [ -z "$VM_IMG" ]; then
echo "ERROR: VM_IMG: path to qcow2 image not provided - not running" echo "ERROR: VM_IMG: path to qcow2 image not provided - not running"