From d6050f9b23727211705f8820437b994ef150ef83 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 19 Dec 2019 15:37:55 -0700 Subject: [PATCH] test/unit: move all scsi tests under run_test call Change-Id: I10b88210d15c2fd933005bb4b13f8d3359be877d Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478531 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Shuhei Matsumoto Community-CI: SPDK CI Jenkins --- test/unit/unittest.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh index 615ef5b10..4030515f0 100755 --- a/test/unit/unittest.sh +++ b/test/unit/unittest.sh @@ -88,6 +88,14 @@ function unittest_nvmf { $valgrind $testdir/lib/nvmf/tcp.c/tcp_ut } +function unittest_scsi { + $valgrind $testdir/lib/scsi/dev.c/dev_ut + $valgrind $testdir/lib/scsi/lun.c/lun_ut + $valgrind $testdir/lib/scsi/scsi.c/scsi_ut + $valgrind $testdir/lib/scsi/scsi_bdev.c/scsi_bdev_ut + $valgrind $testdir/lib/scsi/scsi_pr.c/scsi_pr_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 @@ -176,12 +184,7 @@ 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 -$valgrind $testdir/lib/scsi/scsi.c/scsi_ut -$valgrind $testdir/lib/scsi/scsi_bdev.c/scsi_bdev_ut -$valgrind $testdir/lib/scsi/scsi_pr.c/scsi_pr_ut +run_test "unittest_scsi" unittest_scsi $valgrind $testdir/lib/lvol/lvol.c/lvol_ut