]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge remote-tracking branch 'origin/6.0' into rrl-wip docs-develop-rrl-8r8r8r/deployments/4019
authorLukáš Ondráček <lukas.ondracek@nic.cz>
Tue, 7 May 2024 14:06:23 +0000 (16:06 +0200)
committerLukáš Ondráček <lukas.ondracek@nic.cz>
Tue, 7 May 2024 14:06:23 +0000 (16:06 +0200)
1  2 
.gitlab-ci.yml
daemon/lua/kres-gen-30.lua
daemon/lua/kres-gen-31.lua
daemon/lua/kres-gen-32.lua
daemon/lua/kres-gen.sh
daemon/meson.build
meson.build
tests/unit/meson.build

diff --cc .gitlab-ci.yml
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc meson.build
Simple merge
index 59e3b3ef2ff33dad48237994d21525be72c2e36f,747f1d3b6bb22b9999791d608f2252262d0a7788..04d8d4a9521778babb72ff48c5eda7874f78ce5a
@@@ -20,21 -20,14 +20,22 @@@ foreach unit_test : unit_test
      unit_test[0],
      unit_test[1],
      dependencies: [
 +      kresd_deps,
+       cmocka,
        contrib_dep,
-       libkres_dep,
        libknot,
-       cmocka,
+       libkres_dep,
+       libuv,
        lmdb,
 +      libdnssec,
 +      # https://mesonbuild.com/howtox.html#add-math-library-lm-portably
 +      (meson.get_compiler('c').find_library('m', required : false)),
      ],
    )
 +
 +  # additional suites
 +  extra_suites = unit_test.length() >= 3 ? unit_test[2] : []
 +
    test(
      'unit.' + unit_test[0],
      exec_test,