From: Zbigniew Jędrzejewski-Szmek Date: Fri, 8 Nov 2019 15:57:25 +0000 (+0100) Subject: tests: modify enter_cgroup_subroot() to return the new path X-Git-Tag: v244-rc1~62^2~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64ad9e088d1c93a62d67ff571ced2ad30955626c;p=thirdparty%2Fsystemd.git tests: modify enter_cgroup_subroot() to return the new path --- diff --git a/src/shared/tests.c b/src/shared/tests.c index a4ffd3ec024..96b5b805a96 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -172,7 +172,7 @@ bool can_memlock(void) { return b; } -int enter_cgroup_subroot(void) { +int enter_cgroup_subroot(char **ret_cgroup) { _cleanup_free_ char *cgroup_root = NULL, *cgroup_subroot = NULL; CGroupMask supported; int r; @@ -192,5 +192,11 @@ int enter_cgroup_subroot(void) { if (r < 0) return r; - return cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL); + r = cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL); + if (r < 0) + return r; + + if (ret_cgroup) + *ret_cgroup = TAKE_PTR(cgroup_subroot); + return 0; } diff --git a/src/shared/tests.h b/src/shared/tests.h index 3e4368460dd..5a6fd53f36b 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -19,7 +19,7 @@ static inline bool manager_errno_skip_test(int r) { } char* setup_fake_runtime_dir(void); -int enter_cgroup_subroot(void); +int enter_cgroup_subroot(char **ret_cgroup); const char* get_testdata_dir(void); const char* get_catalog_dir(void); bool slow_tests_enabled(void); diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c index 13f81d48d05..31e0c0b916b 100644 --- a/src/test/test-bpf-firewall.c +++ b/src/test/test-bpf-firewall.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { if (!can_memlock()) return log_tests_skipped("Can't use mlock(), skipping."); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 28a37212554..7fad58f690e 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -33,7 +33,7 @@ static int test_cgroup_mask(void) { int r; CGroupMask cpu_accounting_mask = get_cpu_accounting_mask(); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index c4af2a3cdfd..1286f11e4eb 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -18,7 +18,7 @@ static int test_default_memory_low(void) { uint64_t dml_tree_default; int r; - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-engine.c b/src/test/test-engine.c index a32e98af119..b8351141fe2 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) { test_setup_logging(LOG_DEBUG); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-execute.c b/src/test/test-execute.c index d8464147502..9d6aeed776f 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -869,7 +869,7 @@ int main(int argc, char *argv[]) { if (getuid() != 0) return log_tests_skipped("not root"); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 8127afdd766..8d0a4ad2e2c 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -779,7 +779,7 @@ int main(int argc, char *argv[]) { test_setup_logging(LOG_INFO); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-path.c b/src/test/test-path.c index 2537dc69720..6ad222b5f92 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -31,7 +31,7 @@ static int setup_test(Manager **m) { assert_se(m); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 386cd93cbf1..cd455378473 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) { test_setup_logging(LOG_INFO); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index d63647bad2c..38e37dacb2b 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -820,7 +820,7 @@ int main(int argc, char* argv[]) { test_setup_logging(LOG_INFO); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available"); diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c index a26a0c9d9bb..bad289767d2 100644 --- a/src/test/test-watch-pid.c +++ b/src/test/test-watch-pid.c @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { if (getuid() != 0) return log_tests_skipped("not root"); - r = enter_cgroup_subroot(); + r = enter_cgroup_subroot(NULL); if (r == -ENOMEDIUM) return log_tests_skipped("cgroupfs not available");