Commit fbb481c2 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

test: add SPDK_TEST_NVME_CLI autotest flag 



As requested in GitHub issue #361, we should have a way to control
whether the SPDK-patched nvme-cli tests are executed.

Also add a report_test_completion call for the NVMe-oF nvme-cli test
so we can easily track whether it executed (the local PCIe nvme-cli
test already had a completion).

Change-Id: I70c26bcf2489ccfa563214a9723603aa705be7ab
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/418866


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarJohn Meneghini <johnm@netapp.com>
Reviewed-by: default avatar <ed.rodriguez@netapp.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 56ad1cbe

autotest.sh

+3 −1
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ fi 


if [ $SPDK_TEST_NVME -eq 1 ]; then

	run_test test/nvme/nvme.sh

	if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then

		run_test test/nvme/spdk_nvme_cli.sh

	fi

	# Only test hotplug without ASAN enabled. Since if it is

	# enabled, it catches SEGV earlier than our handler which

	# breaks the hotplug logic

test/common/autotest_common.sh

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ fi 
: ${SPDK_TEST_ISCSI=1}; export SPDK_TEST_ISCSI

: ${SPDK_TEST_ISCSI_INITIATOR=1}; export SPDK_TEST_ISCSI_INITIATOR

: ${SPDK_TEST_NVME=1}; export SPDK_TEST_NVME

: ${SPDK_TEST_NVME_CLI=1}; export SPDK_TEST_NVME_CLI

: ${SPDK_TEST_NVMF=1}; export SPDK_TEST_NVMF

: ${SPDK_TEST_RBD=1}; export SPDK_TEST_RBD

: ${SPDK_TEST_VHOST=1}; export SPDK_TEST_VHOST
@@ -161,6 +162,10 @@ else 
	export SPDK_TEST_ISCSI_INITIATOR=0

fi



if [ ! -d "${DEPENDENCY_DIR}/nvme-cli" ]; then

	export SPDK_TEST_NVME_CLI=0

fi



export config_params



if [ -z "$output_dir" ]; then

test/common/config/vm_setup.sh

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ SPDK_TEST_UNITTEST=1 
SPDK_TEST_ISCSI=1

SPDK_TEST_ISCSI_INITIATOR=1

SPDK_TEST_NVME=1

SPDK_TEST_NVME_CLI=1

SPDK_TEST_NVMF=1

SPDK_TEST_RBD=1

# requires some extra configuration. see TEST_ENV_SETUP_README

test/nvmf/nvme_cli/nvme_cli.sh

+1 −0
Original line number Diff line number Diff line
@@ -84,4 +84,5 @@ trap - SIGINT SIGTERM EXIT 


nvmfcleanup

killprocess $nvmfpid

report_test_completion "nvmf_spdk_nvme_cli"

timing_exit nvme_cli

test/nvmf/nvmf.sh

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ export NVMF_APP="./app/nvmf_tgt/nvmf_tgt -i 0" 


run_test test/nvmf/filesystem/filesystem.sh

run_test test/nvmf/discovery/discovery.sh

if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then

	run_test test/nvmf/nvme_cli/nvme_cli.sh

fi

run_test test/nvmf/lvol/nvmf_lvol.sh

run_test test/nvmf/shutdown/shutdown.sh