From d7241356ff5194b942a7813a6af79a773e0baf29 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 19 Dec 2019 15:27:02 -0700
Subject: [PATCH] test/unit: move iscsi tests under a single run_test

Change-Id: I6222091d79d67b92b4e1c3b3cf399287ad821ffb
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478527
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 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index 6265bbe44..9d7d04b1c 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -50,6 +50,15 @@ function unittest_ftl {
 	$valgrind $testdir/lib/ftl/ftl_io.c/ftl_io_ut
 }
 
+function unittest_iscsi {
+	$valgrind $testdir/lib/iscsi/conn.c/conn_ut
+	$valgrind $testdir/lib/iscsi/param.c/param_ut
+	$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf
+	$valgrind $testdir/lib/iscsi/iscsi.c/iscsi_ut
+	$valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut $testdir/lib/iscsi/init_grp.c/init_grp.conf
+	$valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut $testdir/lib/iscsi/portal_grp.c/portal_grp.conf
+}
+
 # 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
@@ -111,6 +120,8 @@ if [ $(uname -s) = Linux ]; then
 	run_test "unittest_ftl" unittest_ftl
 fi
 
+run_test "unittest_iscsi" unittest_iscsi
+
 $valgrind $testdir/lib/sock/sock.c/sock_ut
 
 $valgrind $testdir/lib/nvme/nvme.c/nvme_ut
@@ -157,13 +168,6 @@ $valgrind $testdir/lib/lvol/lvol.c/lvol_ut
 
 $valgrind $testdir/lib/notify/notify.c/notify_ut
 
-$valgrind $testdir/lib/iscsi/conn.c/conn_ut
-$valgrind $testdir/lib/iscsi/param.c/param_ut
-$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf
-$valgrind $testdir/lib/iscsi/iscsi.c/iscsi_ut
-$valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut $testdir/lib/iscsi/init_grp.c/init_grp.conf
-$valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut $testdir/lib/iscsi/portal_grp.c/portal_grp.conf
-
 if grep -q '#define SPDK_CONFIG_REDUCE 1' $rootdir/config.h; then
 	$valgrind $testdir/lib/reduce/reduce.c/reduce_ut
 fi