meson: config_tests - remove obsolete args, retuncode checks

diff --git a/meson.build b/meson.build
index 8cb43d0c85eaffc650b7eb7a36405c257bb5e3fe..73fb06cba87a5addfdaa84e8b8e158521ef718f3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -108,7 +108,7 @@ unit_tests = [
 
 config_tests = [
   # [name, files(test)]  # or
-  # [name, files(test), [arg1, arg2], should_fail]
+  # [name, files(test), [extra_suites]]
 ]
 
 integr_tests = [

diff --git a/tests/config/meson.build b/tests/config/meson.build
index 494d67118dcc86f409dabaf751d8d334624f3721..c0dff6a242495b6e11527d3679b497aaa4e49585 100644 (file)
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -1,6 +1,6 @@
 config_tests += [
-  ['basic', files('basic.test.lua'), [], false, ['skip_asan']],
-  ['cache', files('cache.test.lua'), [], false, ['skip_asan']],
+  ['basic', files('basic.test.lua'), ['skip_asan']],
+  ['cache', files('cache.test.lua'), ['skip_asan']],
   ['lru', files('lru.test.lua')],
   ['tls', files('tls.test.lua')],
   ['worker', files('worker.test.lua')],
@@ -11,20 +11,8 @@ run_configtest = find_program('../../scripts/test-config.sh')
 
 
 foreach config_test : config_tests
-  # kresd arguments
-  conftest_args = [
-    '-c', files('test.cfg'),
-    '-f', '1',
-  ]
-  if config_test.length() >= 3
-    conftest_args += config_test[2]
-  endif
-
-  # kresd return code check
-  conftest_should_fail = config_test.length() >= 4 ? config_test[3] : false
-
   # additional suites
-  extra_suites = config_test.length() >= 5 ? config_test[4] : []
+  extra_suites = config_test.length() >= 3 ? config_test[2] : []
 
   # environment variables for test
   conftest_env = environment()
@@ -37,12 +25,14 @@ foreach config_test : config_tests
   test(
     'config.' + config_test[0],
     run_configtest,
-    args: conftest_args,
+    args: [
+       '-c', files('test.cfg'),
+       '-f', '1',
+    ],
     env: conftest_env,
     suite: [
       'postinstall',
       'config',
     ] + extra_suites,
-    should_fail: conftest_should_fail,
   )
 endforeach