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

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

diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index 7b0254b84..9b58a1eff 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -25,6 +25,15 @@ function unittest_bdev {
 	$valgrind $testdir/lib/bdev/mt/bdev.c/bdev_ut
 }
 
+function unittest_blob {
+	$valgrind $testdir/lib/blob/blob.c/blob_ut
+	$valgrind $testdir/lib/blobfs/tree.c/tree_ut
+	$valgrind $testdir/lib/blobfs/blobfs_async_ut/blobfs_async_ut
+	# blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind
+	$testdir/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut
+	$valgrind $testdir/lib/blobfs/blobfs_bdev.c/blobfs_bdev_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
@@ -80,13 +89,7 @@ if grep -q '#define SPDK_CONFIG_PMDK 1' $rootdir/include/spdk/config.h; then
 	run_test "unittest_bdev_pmem" $valgrind $testdir/lib/bdev/pmem/bdev_pmem_ut
 fi
 
-$valgrind $testdir/lib/blob/blob.c/blob_ut
-$valgrind $testdir/lib/blobfs/tree.c/tree_ut
-
-$valgrind $testdir/lib/blobfs/blobfs_async_ut/blobfs_async_ut
-# blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind
-$testdir/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut
-$valgrind $testdir/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut
+run_test "unittest_blob_blobfs" unittest_blob
 
 $valgrind $testdir/lib/event/subsystem.c/subsystem_ut
 $valgrind $testdir/lib/event/app.c/app_ut