From ed5faeef2ccf4bc8343ec96c6115add96ded195c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 16 Feb 2018 10:17:46 +0100 Subject: pid1: do not initialize join_controllers by default We're moving towards unified cgroup hierarchy where this is not necessary. This makes main.c a bit simpler. --- src/test/test-conf-parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/test') diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index fc6847954..30ca7a8e7 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -260,7 +260,9 @@ static void test_config_parse_join_controllers(void) { /* Test special case of no mounted controllers */ r = config_parse_join_controllers(NULL, "example.conf", 12, "Section", 10, "JoinControllers", 0, "", &c, NULL); assert_se(r == 0); - assert_se(c == NULL); + assert_se(c); + assert_se(strv_equal(c[0], STRV_MAKE_EMPTY)); + assert_se(c[1] == NULL); /* Test merging of overlapping lists */ r = config_parse_join_controllers(NULL, "example.conf", 13, "Section", 10, "JoinControllers", 0, "a,b b,c", &c, NULL); -- cgit v1.2.3