From cd8b9455adbca59c81920f3aa558e408a90c64b5 Mon Sep 17 00:00:00 2001
From: Ziye Yang <ziye.yang@intel.com>
Date: Tue, 30 Jun 2020 00:34:52 +0800
Subject: [PATCH] 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: Ziye 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: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
---
 mk/spdk.lib_deps.mk               | 1 +
 scripts/vagrant/autorun-spdk.conf | 1 +
 test/common/autotest_common.sh    | 7 +++++++
 test/unit/unittest.sh             | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk
index 1b5f75040..128f60aa5 100644
--- a/mk/spdk.lib_deps.mk
+++ b/mk/spdk.lib_deps.mk
@@ -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
diff --git a/scripts/vagrant/autorun-spdk.conf b/scripts/vagrant/autorun-spdk.conf
index fa40d1dca..067522c6f 100644
--- a/scripts/vagrant/autorun-spdk.conf
+++ b/scripts/vagrant/autorun-spdk.conf
@@ -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
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 14995624d..912f4bf36 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -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.
diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh
index 955ddb7f9..39bfdbb4a 100755
--- a/test/unit/unittest.sh
+++ b/test/unit/unittest.sh
@@ -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() {