From ad73816c179d653b02ac524f916dd3584434688b Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 19 Dec 2019 15:32:00 -0700
Subject: [PATCH] test/unit: put all nvme tests under run_test calls

Change-Id: I04cd9bb5aee263450f55ebfd1fe2f2a487e73478
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478529
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: Jim Harris <james.r.harris@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/unit/unittest.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index ed668d695..dd28cb42c 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -66,6 +66,20 @@ function unittest_json {
 	$valgrind $testdir/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut
 }
 
+function unittest_nvme {
+	$valgrind $testdir/lib/nvme/nvme.c/nvme_ut
+	$valgrind $testdir/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut
+	$valgrind $testdir/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut
+	$valgrind $testdir/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut
+	$valgrind $testdir/lib/nvme/nvme_ns.c/nvme_ns_ut
+	$valgrind $testdir/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut
+	$valgrind $testdir/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut
+	$valgrind $testdir/lib/nvme/nvme_qpair.c/nvme_qpair_ut
+	$valgrind $testdir/lib/nvme/nvme_pcie.c/nvme_pcie_ut
+	$valgrind $testdir/lib/nvme/nvme_quirks.c/nvme_quirks_ut
+	$valgrind $testdir/lib/nvme/nvme_tcp.c/nvme_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
@@ -132,19 +146,9 @@ run_test "unittest_json" unittest_json
 
 $valgrind $testdir/lib/sock/sock.c/sock_ut
 
-$valgrind $testdir/lib/nvme/nvme.c/nvme_ut
-$valgrind $testdir/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut
-$valgrind $testdir/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut
-$valgrind $testdir/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut
-$valgrind $testdir/lib/nvme/nvme_ns.c/nvme_ns_ut
-$valgrind $testdir/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut
-$valgrind $testdir/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut
-$valgrind $testdir/lib/nvme/nvme_qpair.c/nvme_qpair_ut
-$valgrind $testdir/lib/nvme/nvme_pcie.c/nvme_pcie_ut
-$valgrind $testdir/lib/nvme/nvme_quirks.c/nvme_quirks_ut
-$valgrind $testdir/lib/nvme/nvme_tcp.c/nvme_tcp_ut
+run_test "unittest_nvme" unittest_nvme
 if grep -q '#define SPDK_CONFIG_RDMA 1' $rootdir/include/spdk/config.h; then
-	$valgrind $testdir/lib/nvme/nvme_rdma.c/nvme_rdma_ut
+	run_test "unittest_nvme_rdma" $valgrind $testdir/lib/nvme/nvme_rdma.c/nvme_rdma_ut
 fi
 
 $valgrind $testdir/lib/ioat/ioat.c/ioat_ut