Skip to content
Snippets Groups Projects
Commit 54dc29e6 authored by Štěpán Balážik's avatar Štěpán Balážik
Browse files

ci: reenable `sendmmsg` for Deckard tests

parent 6db95bf9
No related branches found
No related tags found
1 merge request!992Deckard update
......@@ -62,8 +62,7 @@ archive:
build:
<<: *build
script:
# sendmmsg: deckard can't handle that syscall
- meson build_ci --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled -Dsendmmsg=disabled
- meson build_ci --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled
- ninja -C build_ci
- ninja -C build_ci install >/dev/null
- ${MESON_TEST} --suite unit --suite config
......
......@@ -172,8 +172,7 @@ The following command runs all enabled tests. By default, only unit tests are en
More comprehensive tests require you to install ``kresd`` into the configured
prefix before running the test suite. They also have to be explicitly enabled
by using either ``-Dconfig_tests=enabled`` for postinstall config tests, or
``-Dextra_tests=enabled`` for all tests, including deckard tests. Please note
the latter also requires ``-Dsendmmsg=disabled``.
``-Dextra_tests=enabled`` for all tests, including deckard tests.
.. code-block:: bash
......
......@@ -37,15 +37,8 @@ if build_extra_tests
python3 = find_program('python3')
py3_deps = []
libuv_before_sendmmsg = dependency('libuv', version: '<1.35', required: false)
subdir('pytests')
if sendmmsg
warning('Integration tests do not work with sendmmsg, disable sendmmsg using meson configure -Dsendmmsg=disabled builddir')
elif not libuv_before_sendmmsg.found()
warning('Integration tests do not work with libuv >= 1.35 because it internally uses sendmmsg which is not supported by Deckard, use an older version of libuv')
else
subdir('integration')
endif
subdir('integration')
foreach py3_dep : py3_deps
py3_import = run_command(python3, '-c', 'import @0@'.format(py3_dep[0]))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment