Commit cd8b9455 authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

test: Enable uring test in CI pool. 



This patch is used to enable uring test in some VMs or machines
in the CI pool.

Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: I75c2ad477f5f648289d8dbb344b75b2408d56a38
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3107


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 73039182

mk/spdk.lib_deps.mk

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ DEPDIRS-bdev_passthru := $(BDEV_DEPS_CONF_THREAD) 
DEPDIRS-bdev_pmem := $(BDEV_DEPS_CONF_THREAD)

DEPDIRS-bdev_raid := $(BDEV_DEPS_CONF_THREAD)

DEPDIRS-bdev_rbd := $(BDEV_DEPS_CONF_THREAD)

DEPDIRS-bdev_uring := $(BDEV_DEPS_CONF_THREAD)

DEPDIRS-bdev_virtio := $(BDEV_DEPS_CONF_THREAD) virtio



# module/event

scripts/vagrant/autorun-spdk.conf

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ SPDK_TEST_OCF=0 
SPDK_TEST_VHOST=0

SPDK_TEST_VHOST_INIT=0

SPDK_TEST_BLOCKDEV=1

SPDK_TEST_URING=0

# doesn't work on vm

SPDK_TEST_IOAT=0

SPDK_TEST_BLOBFS=0

test/common/autotest_common.sh

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ export SPDK_TEST_OPAL 
export SPDK_AUTOTEST_X

: ${SPDK_TEST_RAID5=0}

export SPDK_TEST_RAID5

: ${SPDK_TEST_URING=0}

export SPDK_TEST_URING



# Export PYTHONPATH with addition of RPC framework. New scripts can be created

# specific use cases for tests.
@@ -413,6 +415,11 @@ function get_config_params() { 
		config_params+=' --with-raid5'

	fi



	# Check whether liburing library header exists

	if [ -f /usr/include/liburing/io_uring.h ] && [ $SPDK_TEST_URING -eq 1 ]; then

		config_params+=' --with-uring'

	fi



	# By default, --with-dpdk is not set meaning the SPDK build will use the DPDK submodule.

	# If a DPDK installation is found in a well-known location though, WITH_DPDK_DIR will be

	# set which will override the default and use that DPDK installation instead.

test/unit/unittest.sh

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ function unittest_scsi() { 
function unittest_sock() {

	$valgrind $testdir/lib/sock/sock.c/sock_ut

	$valgrind $testdir/lib/sock/posix.c/posix_ut

	# Check whether uring is configured

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

		$valgrind $testdir/lib/sock/uring.c/uring_ut

	fi

}



function unittest_util() {