Commit d77b0a67 authored by Darek Stojaczyk's avatar Darek Stojaczyk
Browse files

test/spdkcli: cleanup includes 



autotest_common.sh used to be sourced from
test/spdkcli/common.sh (and it still is - we'll clean
it up in a separate patch). Let's source that file in
each spdkcli test script, just like we do in every
other test script.

Change-Id: I2e021bcda7402ee0c5a4a5f45f921bb0142b6783
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/458176


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

test/spdkcli/iscsi.sh

+6 −4
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -xe



testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/spdkcli/common.sh

source $rootdir/test/iscsi_tgt/common.sh



MATCH_FILE="spdkcli_iscsi.test"

SPDKCLI_BRANCH="/iscsi"

testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh

. $testdir/../iscsi_tgt/common.sh



timing_enter spdkcli_iscsi

trap 'on_error_exit;' ERR

test/spdkcli/nvmf.sh

+6 −4
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -xe



testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/spdkcli/common.sh

source $rootdir/test/nvmf/common.sh



MATCH_FILE="spdkcli_nvmf.test"

SPDKCLI_BRANCH="/nvmf"

testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh

. $testdir/../nvmf/common.sh



timing_enter spdkcli_nvmf

trap 'on_error_exit; revert_soft_roce' ERR

test/spdkcli/pmem.sh

+5 −3
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -xe



testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/spdkcli/common.sh



MATCH_FILE="spdkcli_pmem.test"

SPDKCLI_BRANCH="/bdevs/pmemblk"

testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh



timing_enter spdkcli_pmem

trap 'on_error_exit;' ERR

test/spdkcli/raid.sh

+6 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -xe



testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/spdkcli/common.sh

source $rootdir/test/iscsi_tgt/common.sh



MATCH_FILE="spdkcli_raid.test"

SPDKCLI_BRANCH="/bdevs"

test/spdkcli/rbd.sh

+5 −4
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -xe



testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/spdkcli/common.sh



MATCH_FILE="spdkcli_rbd.test"

SPDKCLI_BRANCH="/bdevs/rbd"

testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh



timing_enter spdk_cli_rbd

trap 'on_error_exit' ERR
@@ -14,7 +16,6 @@ timing_exit run_spdk_tgt 


timing_enter spdkcli_create_rbd_config

trap 'rbd_cleanup; on_error_exit' ERR

rootdir=$(readlink -f $SPDKCLI_BUILD_DIR)

rbd_cleanup

rbd_setup 127.0.0.1

$spdkcli_job "'/bdevs/rbd create rbd foo 512' 'Ceph0' True