From fbb481c2c613e217084bfe578f50d47336d1b762 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 10 Jul 2018 09:32:30 -0700 Subject: [PATCH] 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: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/418866 Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: John Meneghini Reviewed-by: Tested-by: SPDK Automated Test System --- autotest.sh | 4 +++- test/common/autotest_common.sh | 5 +++++ test/common/config/vm_setup.sh | 1 + test/nvmf/nvme_cli/nvme_cli.sh | 1 + test/nvmf/nvmf.sh | 4 +++- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/autotest.sh b/autotest.sh index bff51b443..c36c7374b 100755 --- a/autotest.sh +++ b/autotest.sh @@ -105,7 +105,9 @@ fi if [ $SPDK_TEST_NVME -eq 1 ]; then run_test test/nvme/nvme.sh - run_test test/nvme/spdk_nvme_cli.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 diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 12cca86ce..229f6cb4f 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -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 diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 2d0fe1baf..eadaa9ebc 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -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 diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index c2171def2..5bf6b3d8f 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -84,4 +84,5 @@ trap - SIGINT SIGTERM EXIT nvmfcleanup killprocess $nvmfpid +report_test_completion "nvmf_spdk_nvme_cli" timing_exit nvme_cli diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 76e79576f..14720cfbd 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -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 -run_test test/nvmf/nvme_cli/nvme_cli.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