osmo_io_uring: Run check of tests/osmo_io with io_uring also

Related: OS#5751
Change-Id: I82db9a15bc483a5447d86352512afaafa2bcfbb6
This commit is contained in:
Andreas Eversberg 2024-02-15 13:30:38 +01:00 committed by Oliver Smith
parent 4ec4a38f92
commit 35f20b1ff7
4 changed files with 16 additions and 2 deletions

View File

@ -282,6 +282,11 @@ AC_ARG_ENABLE([sctp-tests], [AS_HELP_STRING([--disable-sctp-tests], [Do not run
[ENABLE_SCTP_TESTS=$enableval], [ENABLE_SCTP_TESTS="yes"])
AM_CONDITIONAL(ENABLE_SCTP_TESTS, test x"$ENABLE_SCTP_TESTS" = x"yes")
AC_ARG_ENABLE([uring-tests], [AS_HELP_STRING([--disable-uring-tests], [Do not run io_uring tests])],
[ENABLE_URING_TESTS=$enableval], [ENABLE_URING_TESTS="yes"])
AM_CONDITIONAL(ENABLE_URING_TESTS, test x"$ENABLE_URING_TESTS" = x"yes")
AC_SUBST(ENABLE_URING_TESTS)
AC_ARG_ENABLE(plugin,
[AS_HELP_STRING(
[--disable-plugin],

1
debian/rules vendored
View File

@ -30,6 +30,7 @@ override_dh_auto_configure:
set -x && \
CONFIGURE_FLAGS=" \
--disable-sctp-tests \
--disable-uring-tests \
--enable-static \
--enable-systemd-logging \
"; \

View File

@ -737,12 +737,12 @@ endif
check-local: atconfig $(TESTSUITE)
[ -e /proc/cpuinfo ] && cat /proc/cpuinfo
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
$(MAKE) $(AM_MAKEFLAGS) ext-tests
installcheck-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
$(TESTSUITEFLAGS)
$(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS)
clean-local:
test ! -f '$(TESTSUITE)' || \

View File

@ -530,6 +530,14 @@ cat $abs_srcdir/osmo_io/osmo_io_test.err > experr
AT_CHECK([$abs_top_builddir/tests/osmo_io/osmo_io_test], [0], [expout], [experr])
AT_CLEANUP
AT_SETUP([osmo_io (uring)])
AT_KEYWORDS([osmo_io (uring)])
AT_SKIP_IF([ test "$ENABLE_URING" != "yes" || test "$ENABLE_URING_TESTS" != "yes" ])
cat $abs_srcdir/osmo_io/osmo_io_test.ok > expout
cat $abs_srcdir/osmo_io/osmo_io_test.err > experr
AT_CHECK([LIBOSMO_IO_BACKEND=IO_URING $abs_top_builddir/tests/osmo_io/osmo_io_test], [0], [expout], [experr])
AT_CLEANUP
AT_SETUP([soft_uart])
AT_KEYWORDS([soft_uart])
cat $abs_srcdir/soft_uart/soft_uart_test.ok > expout