0d33baa14c
Add an invocation of `start_subsystem_init` method of spdkcli to iscsi test. This method is one of few that left untested in spdkcli. iscsi test had to be changed a bit because `start_subsystem_init` requires spdk to be started with `--wait-for-rpc`. This patch is related to trello task: https://trello.com/c/CHOOxcGj/151-spdkcli-extend-test-coverage Change-Id: I4f49f2ce499ef849d4d41a391844f5947c1b133d Signed-off-by: Vitaliy Mysak <vitaliy.mysak@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/462213 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
46 lines
1.1 KiB
Bash
46 lines
1.1 KiB
Bash
spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py"
|
|
spdk_clear_config_py="$rootdir/test/json_config/clear_config.py"
|
|
|
|
function on_error_exit() {
|
|
set +e
|
|
if [ ! -z $spdk_tgt_pid ]; then
|
|
killprocess $spdk_tgt_pid
|
|
fi
|
|
if [ ! -z $nvmf_tgt_pid ]; then
|
|
killprocess $nvmf_tgt_pid
|
|
fi
|
|
if [ ! -z $iscsi_tgt_pid ]; then
|
|
killprocess $iscsi_tgt_pid
|
|
fi
|
|
if [ ! -z $vhost_tgt_pid ]; then
|
|
killprocess $vhost_tgt_pid
|
|
fi
|
|
rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem
|
|
print_backtrace
|
|
exit 1
|
|
}
|
|
|
|
function run_spdk_tgt() {
|
|
$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 4096 &
|
|
spdk_tgt_pid=$!
|
|
waitforlisten $spdk_tgt_pid
|
|
}
|
|
|
|
function run_nvmf_tgt() {
|
|
$rootdir/app/nvmf_tgt/nvmf_tgt -m 0x3 -p 0 -s 4096 &
|
|
nvmf_tgt_pid=$!
|
|
waitforlisten $nvmf_tgt_pid
|
|
}
|
|
|
|
function run_vhost_tgt() {
|
|
$rootdir/app/vhost/vhost -m 0x3 -p 0 -s 4096 &
|
|
vhost_tgt_pid=$!
|
|
waitforlisten $vhost_tgt_pid
|
|
}
|
|
|
|
function check_match() {
|
|
$rootdir/scripts/spdkcli.py ll $SPDKCLI_BRANCH > $testdir/match_files/${MATCH_FILE}
|
|
$rootdir/test/app/match/match $testdir/match_files/${MATCH_FILE}.match
|
|
rm -f $testdir/match_files/${MATCH_FILE}
|
|
}
|