From 0c697720565764e064e2ca468c825c0302bce326 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 19 Dec 2019 15:36:08 -0700
Subject: [PATCH] test/unit: move all nvmf tests under run_test calls.

Change-Id: I356655debe23437d6177e49377821370bb193d7b
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478530
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/unit/unittest.sh | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index dd28cb42c..615ef5b10 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -80,6 +80,14 @@ function unittest_nvme {
 	$valgrind $testdir/lib/nvme/nvme_tcp.c/nvme_tcp_ut
 }
 
+function unittest_nvmf {
+	$valgrind $testdir/lib/nvmf/ctrlr.c/ctrlr_ut
+	$valgrind $testdir/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut
+	$valgrind $testdir/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut
+	$valgrind $testdir/lib/nvmf/subsystem.c/subsystem_ut
+	$valgrind $testdir/lib/nvmf/tcp.c/tcp_ut
+}
+
 # if ASAN is enabled, use it.  If not use valgrind if installed but allow
 # the env variable to override the default shown below.
 if [ -z ${valgrind+x} ]; then
@@ -155,14 +163,19 @@ $valgrind $testdir/lib/ioat/ioat.c/ioat_ut
 
 $valgrind $testdir/lib/log/log.c/log_ut
 
-$valgrind $testdir/lib/nvmf/ctrlr.c/ctrlr_ut
-$valgrind $testdir/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut
-$valgrind $testdir/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut
-if grep -q '#define SPDK_CONFIG_RDMA 1' $rootdir/include/spdk/config.h; then
-	$valgrind $testdir/lib/nvmf/rdma.c/rdma_ut
+run_test "unittest_nvmf" unittest_nvmf
+if [ -e $testdir/lib/nvmf/fc.c/fc_ut ]; then
+	run_test "unittest_nvmf_fc" $valgrind $testdir/lib/nvmf/fc.c/fc_ut
 fi
-$valgrind $testdir/lib/nvmf/subsystem.c/subsystem_ut
-$valgrind $testdir/lib/nvmf/tcp.c/tcp_ut
+
+if [ -e $testdir/lib/nvmf/fc_ls.c/fc_ls_ut ]; then
+	run_test "unittest_nvmf_fc_ls" $valgrind $testdir/lib/nvmf/fc_ls.c/fc_ls_ut
+fi
+
+if grep -q '#define SPDK_CONFIG_RDMA 1' $rootdir/include/spdk/config.h; then
+	run_test "unittest_nvmf_rdma" $valgrind $testdir/lib/nvmf/rdma.c/rdma_ut
+fi
+
 
 $valgrind $testdir/lib/scsi/dev.c/dev_ut
 $valgrind $testdir/lib/scsi/lun.c/lun_ut
@@ -195,14 +208,6 @@ if [ $(uname -s) = Linux ]; then
 $valgrind $testdir/lib/vhost/vhost.c/vhost_ut
 fi
 
-if [ -e $testdir/lib/nvmf/fc.c/fc_ut ]; then
-	$valgrind $testdir/lib/nvmf/fc.c/fc_ut
-fi
-
-if [ -e $testdir/lib/nvmf/fc_ls.c/fc_ls_ut ]; then
-	$valgrind $testdir/lib/nvmf/fc_ls.c/fc_ls_ut
-fi
-
 # local unit test coverage
 if [ "$cov_avail" = "yes" ]; then
 	$LCOV -q -d . -c -t "$(hostname)" -o $UT_COVERAGE/ut_cov_test.info