diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-12-20 18:13:23 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-01-05 13:58:32 +0100 |
commit | 2767027bb7c6c8c71cf8061fb6beabb4c91cf32f (patch) | |
tree | fcd59f499a27d39b2b72f84dad6c99cbf8709d46 /src/test/test-condition.c | |
parent | 0f08647120031d674075eeba391d2463870f3a6b (diff) | |
download | systemd-2767027bb7c6c8c71cf8061fb6beabb4c91cf32f.tar.gz |
test: fix condition test if there are no controllers
As an optimization cg_mask_to_string() returns NULL if there are no
controllers available. We need to handle that.
Diffstat (limited to 'src/test/test-condition.c')
-rw-r--r-- | src/test/test-condition.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 8323a66ad3..ad64a2bb36 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -29,8 +29,8 @@ #include "apparmor-util.h" #include "architecture.h" #include "audit-util.h" -#include "condition.h" #include "cgroup-util.h" +#include "condition.h" #include "hostname-util.h" #include "id128-util.h" #include "ima-util.h" @@ -187,12 +187,12 @@ static int test_condition_test_control_group_controller(void) { /* Multiple valid controllers at the same time */ assert_se(cg_mask_to_string(system_mask, &controller_name) >= 0); - condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, controller_name, false, false); + condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, strempty(controller_name), false, false); assert_se(condition); assert_se(condition_test(condition)); condition_free(condition); - condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, controller_name, false, true); + condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, strempty(controller_name), false, true); assert_se(condition); assert_se(!condition_test(condition)); condition_free(condition); |