Skip to content
Snippets Groups Projects
Verified Commit 8451e991 authored by Tomas Krizek's avatar Tomas Krizek Committed by Petr Špaček
Browse files

meson: config_tests - remove obsolete args, retuncode checks

parent 74098a8b
No related branches found
No related tags found
1 merge request!788daemon/lua/trust_anchors: don't crash when dealing with unknown algorhitm
...@@ -108,7 +108,7 @@ unit_tests = [ ...@@ -108,7 +108,7 @@ unit_tests = [
config_tests = [ config_tests = [
# [name, files(test)] # or # [name, files(test)] # or
# [name, files(test), [arg1, arg2], should_fail] # [name, files(test), [extra_suites]]
] ]
integr_tests = [ integr_tests = [
......
config_tests += [ config_tests += [
['basic', files('basic.test.lua'), [], false, ['skip_asan']], ['basic', files('basic.test.lua'), ['skip_asan']],
['cache', files('cache.test.lua'), [], false, ['skip_asan']], ['cache', files('cache.test.lua'), ['skip_asan']],
['lru', files('lru.test.lua')], ['lru', files('lru.test.lua')],
['tls', files('tls.test.lua')], ['tls', files('tls.test.lua')],
['worker', files('worker.test.lua')], ['worker', files('worker.test.lua')],
...@@ -11,20 +11,8 @@ run_configtest = find_program('../../scripts/test-config.sh') ...@@ -11,20 +11,8 @@ run_configtest = find_program('../../scripts/test-config.sh')
foreach config_test : config_tests 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 # additional suites
extra_suites = config_test.length() >= 5 ? config_test[4] : [] extra_suites = config_test.length() >= 3 ? config_test[2] : []
# environment variables for test # environment variables for test
conftest_env = environment() conftest_env = environment()
...@@ -37,12 +25,14 @@ foreach config_test : config_tests ...@@ -37,12 +25,14 @@ foreach config_test : config_tests
test( test(
'config.' + config_test[0], 'config.' + config_test[0],
run_configtest, run_configtest,
args: conftest_args, args: [
'-c', files('test.cfg'),
'-f', '1',
],
env: conftest_env, env: conftest_env,
suite: [ suite: [
'postinstall', 'postinstall',
'config', 'config',
] + extra_suites, ] + extra_suites,
should_fail: conftest_should_fail,
) )
endforeach endforeach
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