From 637ccd2fa42886d2c5b11f3f7a8aafaa9800d96d Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 31 Dec 2021 23:12:36 +0000 Subject: [PATCH 1/2] tests: run nss-{users|hosts} by default to prevent issues like https://github.com/systemd/systemd/issues/21935 by testing the code under ASan/UBSan --- src/test/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/meson.build b/src/test/meson.build index 364cd3dd3f..97e9ac8909 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -608,14 +608,14 @@ tests += [ 'src/test/nss-test-util.h'], [], [libdl], - [], 'ENABLE_NSS', 'manual'], + [], 'ENABLE_NSS'], [['src/test/test-nss-users.c', 'src/test/nss-test-util.c', 'src/test/nss-test-util.h'], [], [libdl], - [], 'ENABLE_NSS', 'manual'], + [], 'ENABLE_NSS'], [['src/test/test-bus-util.c']], From 951280ce9938b8ce1c618b1e6d1fae9e02d67ae7 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 31 Dec 2021 23:14:59 +0000 Subject: [PATCH 2/2] tests: no longer load libnss_{files|dns} Those libraries aren't provided by systemd so they shouldn't be included here --- src/test/test-nss-hosts.c | 2 +- src/test/test-nss-users.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test-nss-hosts.c b/src/test/test-nss-hosts.c index eac2c74f4c..3ae38acb17 100644 --- a/src/test/test-nss-hosts.c +++ b/src/test/test-nss-hosts.c @@ -420,7 +420,7 @@ static int parse_argv(int argc, char **argv, #if ENABLE_NSS_MYMACHINES "mymachines", #endif - "dns"); + NULL); assert_se(modules); if (argc > 2) { diff --git a/src/test/test-nss-users.c b/src/test/test-nss-users.c index c415c0ca3b..88e2764e99 100644 --- a/src/test/test-nss-users.c +++ b/src/test/test-nss-users.c @@ -214,7 +214,7 @@ static int parse_argv(int argc, char **argv, #if ENABLE_NSS_MYMACHINES "mymachines", #endif - "files"); + NULL); assert_se(modules); if (argc > 2)