From: Štěpán Balážik <stepan.balazik@nic.cz>
Date: Thu, 30 Apr 2020 12:10:04 +0000 (+0200)
Subject: ci: reenable `sendmmsg` for Deckard tests
X-Git-Tag: v5.1.1~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54dc29e6eb8b695ff7fad11b505e022c7d3de9a7;p=thirdparty%2Fknot-resolver.git

ci: reenable `sendmmsg` for Deckard tests
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f87d9e941..7ec76eeeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/doc/build.rst b/doc/build.rst
index f35d13cde..3537eed75 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -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
 
diff --git a/tests/meson.build b/tests/meson.build
index 8aa1e95aa..c4b332c73 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -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]))