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

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

diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index f470fb2f5f..6265bbe44f 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -40,6 +40,16 @@ function unittest_event {
 	$valgrind $testdir/lib/event/reactor.c/reactor_ut
 }
 
+function unittest_ftl {
+	$valgrind $testdir/lib/ftl/ftl_rwb.c/ftl_rwb_ut
+	$valgrind $testdir/lib/ftl/ftl_ppa/ftl_ppa_ut
+	$valgrind $testdir/lib/ftl/ftl_band.c/ftl_band_ut
+	$valgrind $testdir/lib/ftl/ftl_reloc.c/ftl_reloc_ut
+	$valgrind $testdir/lib/ftl/ftl_wptr/ftl_wptr_ut
+	$valgrind $testdir/lib/ftl/ftl_md/ftl_md_ut
+	$valgrind $testdir/lib/ftl/ftl_io.c/ftl_io_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
@@ -97,6 +107,9 @@ fi
 
 run_test "unittest_blob_blobfs" unittest_blob
 run_test "unittest_event" unittest_event
+if [ $(uname -s) = Linux ]; then
+	run_test "unittest_ftl" unittest_ftl
+fi
 
 $valgrind $testdir/lib/sock/sock.c/sock_ut
 
@@ -170,14 +183,6 @@ $valgrind $testdir/lib/util/pipe.c/pipe_ut
 
 if [ $(uname -s) = Linux ]; then
 $valgrind $testdir/lib/vhost/vhost.c/vhost_ut
-
-$valgrind $testdir/lib/ftl/ftl_rwb.c/ftl_rwb_ut
-$valgrind $testdir/lib/ftl/ftl_ppa/ftl_ppa_ut
-$valgrind $testdir/lib/ftl/ftl_band.c/ftl_band_ut
-$valgrind $testdir/lib/ftl/ftl_reloc.c/ftl_reloc_ut
-$valgrind $testdir/lib/ftl/ftl_wptr/ftl_wptr_ut
-$valgrind $testdir/lib/ftl/ftl_md/ftl_md_ut
-$valgrind $testdir/lib/ftl/ftl_io.c/ftl_io_ut
 fi
 
 if [ -e $testdir/lib/nvmf/fc.c/fc_ut ]; then