From 9daf838db0714731299b5c0acbbdfcb929cc9d2b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 8 Dec 2017 13:28:19 -0700 Subject: [PATCH] test/iscsi: only run NVMe-oF test when enabled Check the SPDK_TEST_NVMF flag before running the iscsi_tgt + NVMe-oF host test. Change-Id: I0d545c98f188edefc089fb79e2879d5d307726f5 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/391027 Tested-by: SPDK Automated Test System Reviewed-by: Ziye Yang Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/iscsi_tgt/iscsi_tgt.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh index d6a658ae9..d2f504138 100755 --- a/test/iscsi_tgt/iscsi_tgt.sh +++ b/test/iscsi_tgt/iscsi_tgt.sh @@ -53,10 +53,13 @@ fi trap - SIGINT SIGTERM EXIT kill_stub -# TODO: enable remote NVMe controllers with multi-process so that -# we can use the stub for this test -#Test configure remote NVMe device from rpc -run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 0 -#Test configure remote NVMe device from conf file -run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 1 +if [ $SPDK_TEST_NVMF -eq 1 ]; then + # TODO: enable remote NVMe controllers with multi-process so that + # we can use the stub for this test + # Test configure remote NVMe device from rpc + run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 0 + # Test configure remote NVMe device from conf file + run_test ./test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh 1 +fi + timing_exit iscsi_tgt