mirror of
https://github.com/systemd/systemd.git
synced 2024-10-30 06:25:37 +03:00
tests: log_tests_skipped() already appends ", skipping tests"
We would say: test-bpf-lsm: Can't use mlock(), skipping., skipping tests.
This commit is contained in:
parent
3bcb5dc1a5
commit
4a55ce8f83
@ -302,7 +302,7 @@ int main(int argc, char *argv[]) {
|
||||
r = test_receive_device_fail();
|
||||
if (r < 0) {
|
||||
assert_se(r == -EPERM && detect_container() > 0);
|
||||
return log_tests_skipped("Running in container? Skipping remaining tests");
|
||||
return log_tests_skipped("Running in container");
|
||||
}
|
||||
|
||||
assert_se(sd_device_new_from_syspath(&loopback, "/sys/class/net/lo") >= 0);
|
||||
|
@ -289,11 +289,11 @@ int main(int argc, char *argv[]) {
|
||||
(void) setrlimit_closest(RLIMIT_MEMLOCK, &rl);
|
||||
|
||||
if (!can_memlock())
|
||||
return log_tests_skipped("Can't use mlock(), skipping.");
|
||||
return log_tests_skipped("Can't use mlock()");
|
||||
|
||||
r = cg_all_unified();
|
||||
if (r <= 0)
|
||||
return log_tests_skipped("Unified hierarchy is required, skipping.");
|
||||
return log_tests_skipped("Unified hierarchy is required");
|
||||
|
||||
r = enter_cgroup_subroot(NULL);
|
||||
if (r == -ENOMEDIUM)
|
||||
|
@ -77,7 +77,7 @@ int main(int argc, char *argv[]) {
|
||||
(void) setrlimit_closest(RLIMIT_MEMLOCK, &rl);
|
||||
|
||||
if (!can_memlock())
|
||||
return log_tests_skipped("Can't use mlock(), skipping.");
|
||||
return log_tests_skipped("Can't use mlock()");
|
||||
|
||||
r = lsm_bpf_supported();
|
||||
if (r <= 0)
|
||||
|
@ -120,14 +120,14 @@ int main(int argc, char *argv[]) {
|
||||
(void) setrlimit_closest(RLIMIT_MEMLOCK, &rl);
|
||||
|
||||
if (!can_memlock())
|
||||
return log_tests_skipped("Can't use mlock(), skipping.");
|
||||
return log_tests_skipped("Can't use mlock()");
|
||||
|
||||
r = bpf_socket_bind_supported();
|
||||
if (r <= 0)
|
||||
return log_tests_skipped("socket-bind is not supported, skipping.");
|
||||
return log_tests_skipped("socket-bind is not supported");
|
||||
|
||||
if (find_netcat_executable(&netcat_path) != 0)
|
||||
return log_tests_skipped("Can not find netcat executable, skipping.");
|
||||
return log_tests_skipped("Can not find netcat executable");
|
||||
|
||||
r = enter_cgroup_subroot(NULL);
|
||||
if (r == -ENOMEDIUM)
|
||||
|
Loading…
Reference in New Issue
Block a user