modules/meson.build: move test definitions closer to modules

diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index 4a5fd2f623f4ef2f95c7431ca128d67441115bef..25416706d84bf0859ef5f12aae2d12ca135b5b62 100644 (file)
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -14,3 +14,7 @@ bogus_log_mod = shared_module(
   install: true,
   install_dir: modules_dir,
 )
+
+integr_tests += [
+  ['bogus_log', join_paths(meson.current_source_dir(), 'test.integr')],
+]

diff --git a/modules/daf/meson.build b/modules/daf/meson.build
index a31bc4b5a891d3998affc037aafdc369b388f06b..94a3ebeef055fb096772e5e42ac88fa102bcb684 100644 (file)
--- a/modules/daf/meson.build
+++ b/modules/daf/meson.build
@@ -6,6 +6,10 @@ config_tests += [
   ['daf_http', files('daf_http.test.lua')],
 ]
 
+integr_tests += [
+  ['daf', join_paths(meson.current_source_dir(), 'test.integr')],
+]
+
 lua_mod_src += [
   files('daf.lua'),
 ]

diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index 313d8fba97642e207ea87e96e86eb44e8e8e56be..3085d8901efed85630b66ca3a34a824a5f7a5d20 100644 (file)
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -17,3 +17,7 @@ hints_mod = shared_module(
   install: true,
   install_dir: modules_dir,
 )
+
+config_tests += [
+  ['hints', files('tests/hints.test.lua'), ['skip_asan']],
+]

diff --git a/modules/meson.build b/modules/meson.build
index 84061d0b7504862cb6bfc465680c8b437a8e5fa6..472c29513262e70cee692038f2bb99c108422bee 100644 (file)
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -20,18 +20,15 @@ lua_mod_src = [  # add lua modules without separate meson.build
   files('workarounds/workarounds.lua'),
 ]
 
+# When adding tests, prefer to use module's meson.build (if it exists).
 config_tests += [
   ['predict', files('predict/predict.test.lua')],
-  ['hints', files('hints/tests/hints.test.lua'), ['skip_asan']],
-  ['nsid', files('nsid/nsid.test.lua')],
   ['dns64', files('dns64/dns64.test.lua')],
   ['ta_update', files('ta_update/ta_update.test.lua'), ['snowflake']],
   ['prefill', files('prefill/prefill.test/prefill.test.lua')],
 ]
 
 integr_tests += [
-  ['bogus_log', join_paths(meson.current_source_dir(), 'bogus_log', 'test.integr')],
-  ['daf', join_paths(meson.current_source_dir(), 'daf', 'test.integr')],
   ['rebinding', join_paths(meson.current_source_dir(), 'rebinding', 'test.integr')],
   ['serve_stale', join_paths(meson.current_source_dir(), 'serve_stale', 'test.integr')],
   # NOTE: ta_update may pass in cases when it should fail due to race conditions

diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index 5702004cfd6407a42d0514c828f650c3bf08ca06..00570c141af413591c2cbe326deb48fc076e8e11 100644 (file)
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -17,3 +17,7 @@ nsid_mod = shared_module(
   install: true,
   install_dir: modules_dir,
 )
+
+config_tests += [
+  ['nsid', files('nsid.test.lua')],
+]