meson: tests/config - skip tests with known ASAN issues

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9645e6550e5b25c2fb71b42fe8c3acf699a6f3b6..8937716c9116bb413e8388b3e6bfc06cd4f26773 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,8 +61,7 @@ build-asan:
     - ninja -C build_ci_asan
     - ninja -C build_ci_asan install >/dev/null
     # TODO: not sure what exactly is wrong in leak detection on config tests
-    - ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config
-  allow_failure: true  # TODO remove when ASAN config tests work
+    - ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config --no-suite skip_asan
   # TODO remove privileged when CI runners have --cap-add SYS_PTRACE
   tags:
     - privileged

diff --git a/tests/config/meson.build b/tests/config/meson.build
index a4d62c7f4a4ac92fa3af4109555638eef96f6f13..7d9a68b0b09356b731fd272fe4898fea64bea0d4 100644 (file)
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -1,6 +1,6 @@
 config_tests += [
-  ['basic', files('basic.test.lua')],
-  ['cache', files('cache.test.lua')],
+  ['basic', files('basic.test.lua'), [], false, ['skip_asan']],
+  ['cache', files('cache.test.lua'), [], false, ['skip_asan']],
   ['keyfile.bad_args', files('keyfile/bad_args.test.lua'),
     ['--keyfile-ro', 'root.keys',
      '--keyfile', 'root.keys'],
@@ -39,6 +39,9 @@ foreach config_test : config_tests
   # 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] : []
+
   # environment variables for test
   conftest_env = environment()
   conftest_env.prepend('PATH', sbin_dir)
@@ -55,7 +58,7 @@ foreach config_test : config_tests
     suite: [
       'postinstall',
       'config',
-    ],
+    ] + extra_suites,
     should_fail: conftest_should_fail,
   )
 endforeach