Commit 0c697720 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

test/unit: move all nvmf tests under run_test calls. 



Change-Id: I356655debe23437d6177e49377821370bb193d7b
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478530


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
parent ad73816c

test/unit/unittest.sh

+19 −14
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ function unittest_nvme { 
	$valgrind $testdir/lib/nvme/nvme_tcp.c/nvme_tcp_ut

}



function unittest_nvmf {

	$valgrind $testdir/lib/nvmf/ctrlr.c/ctrlr_ut

	$valgrind $testdir/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut

	$valgrind $testdir/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut

	$valgrind $testdir/lib/nvmf/subsystem.c/subsystem_ut

	$valgrind $testdir/lib/nvmf/tcp.c/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
@@ -155,14 +163,19 @@ $valgrind $testdir/lib/ioat/ioat.c/ioat_ut 


$valgrind $testdir/lib/log/log.c/log_ut



$valgrind $testdir/lib/nvmf/ctrlr.c/ctrlr_ut

$valgrind $testdir/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut

$valgrind $testdir/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut

run_test "unittest_nvmf" unittest_nvmf

if [ -e $testdir/lib/nvmf/fc.c/fc_ut ]; then

	run_test "unittest_nvmf_fc" $valgrind $testdir/lib/nvmf/fc.c/fc_ut

fi



if [ -e $testdir/lib/nvmf/fc_ls.c/fc_ls_ut ]; then

	run_test "unittest_nvmf_fc_ls" $valgrind $testdir/lib/nvmf/fc_ls.c/fc_ls_ut

fi



if grep -q '#define SPDK_CONFIG_RDMA 1' $rootdir/include/spdk/config.h; then

	$valgrind $testdir/lib/nvmf/rdma.c/rdma_ut

	run_test "unittest_nvmf_rdma" $valgrind $testdir/lib/nvmf/rdma.c/rdma_ut

fi

$valgrind $testdir/lib/nvmf/subsystem.c/subsystem_ut

$valgrind $testdir/lib/nvmf/tcp.c/tcp_ut





$valgrind $testdir/lib/scsi/dev.c/dev_ut

$valgrind $testdir/lib/scsi/lun.c/lun_ut
@@ -195,14 +208,6 @@ if [ $(uname -s) = Linux ]; then 
$valgrind $testdir/lib/vhost/vhost.c/vhost_ut

fi



if [ -e $testdir/lib/nvmf/fc.c/fc_ut ]; then

	$valgrind $testdir/lib/nvmf/fc.c/fc_ut

fi



if [ -e $testdir/lib/nvmf/fc_ls.c/fc_ls_ut ]; then

	$valgrind $testdir/lib/nvmf/fc_ls.c/fc_ls_ut

fi



# local unit test coverage

if [ "$cov_avail" = "yes" ]; then

	$LCOV -q -d . -c -t "$(hostname)" -o $UT_COVERAGE/ut_cov_test.info