d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: update timing flags for vhost initiator

Browse Source 
The timing flags in virtio.sh were configured improperly and were
preventing the timing graph from generating. Also, the vhost initiator
tests should be reported under the same timing flag.

Change-Id: I2a4b755ba98c2064e64e38609936d2f5144464cb
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/430971
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2018-10-26 13:55:59 -07:00 committed by Ben Walker
parent 1d9be84bfd
commit 9c3b481b5a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotest.sh
View File

@ -234,10 +234,12 @@ if [ $SPDK_TEST_LVOL -eq 1 ]; then
fi
if [ $SPDK_TEST_VHOST_INIT -eq 1 ]; then
timing_enter vhost_initiator
run_test suite ./test/vhost/initiator/blockdev.sh
run_test suite ./test/vhost/initiator/json_config.sh
run_test suite ./test/spdkcli/virtio.sh
report_test_completion "vhost_initiator"
timing_exit vhost_initiator
fi
if [ $SPDK_TEST_PMDK -eq 1 ]; then

10
test/spdkcli/virtio.sh
View File

@ -5,7 +5,7 @@ testdir=$(readlink -f $(dirname $0))
. $testdir/common.sh
trap 'killprocess $virtio_pid; on_error_exit' ERR
timing_enter spdk_cli_vhost
timing_enter spdk_cli_vhost_init
timing_enter run_spdk_tgt
run_spdk_tgt
@ -41,16 +41,16 @@ if [ ! -z $pci_blk ] && [ ! -z $pci_scsi ]; then
fi
timing_exit spdkcli_check_match
timing_exit spdkcli_create_virtio_user_config
timing_enter spdkcli_create_virtio_user_config
$spdkcli_job "/bdevs/virtioblk_disk create virtioblk_user user $testdir/../../sample_block" "virtioblk_user" True "/var/tmp/virtio.sock"
$spdkcli_job "/bdevs/virtioscsi_disk create virtioscsi_user user $testdir/../../sample_scsi" "virtioscsi_user" True "/var/tmp/virtio.sock"
timing_exit spdkcli_create_virtio_user_config
timing_enter spdkcli_check_match
timing_enter spdkcli_check_match_user_config
MATCH_FILE="spdkcli_virtio_user.test"
SPDKCLI_BRANCH="/vhost"
check_match
timing_exit spdkcli_check_match
timing_exit spdkcli_check_match_user_config
timing_enter spdkcli_clear_virtio_config
$spdkcli_job "/bdevs/virtioscsi_disk delete virtioscsi_user" "" False "/var/tmp/virtio.sock"
@ -71,4 +71,4 @@ timing_exit spdkcli_clear_virtio_config
killprocess $virtio_pid
killprocess $spdk_tgt_pid
timing_exit spdk_cli_vhost
timing_exit spdk_cli_vhost_init