shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

test-execute: use __func__ to shorten messages

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-12 00:26:00 -05:00
parent e94681ad15
commit 303c0bf80c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/test-execute.c
View File

@ -145,11 +145,11 @@ static void test_exec_privatetmp(Manager *m) {
static void test_exec_privatedevices(Manager *m) { static void test_exec_privatedevices(Manager *m) {
if (detect_container() > 0) { if (detect_container() > 0) {
log_notice("testing in container, skipping private device tests"); log_notice("testing in container, skipping %s", __func__);
return; return;
} }
if (!is_inaccessible_available()) { if (!is_inaccessible_available()) {
log_notice("testing without inaccessible, skipping private device tests"); log_notice("testing without inaccessible, skipping %s", __func__);
return; return;
} }
@ -161,11 +161,11 @@ static void test_exec_privatedevices_capabilities(Manager *m) {
int r; int r;
if (detect_container() > 0) { if (detect_container() > 0) {
log_notice("testing in container, skipping private device tests"); log_notice("testing in container, skipping %s", __func__);
return; return;
} }
if (!is_inaccessible_available()) { if (!is_inaccessible_available()) {
log_notice("testing without inaccessible, skipping private device tests"); log_notice("testing without inaccessible, skipping %s", __func__);
return; return;
} }
@ -187,11 +187,11 @@ static void test_exec_protectkernelmodules(Manager *m) {
int r; int r;
if (detect_container() > 0) { if (detect_container() > 0) {
log_notice("testing in container, skipping protectkernelmodules tests"); log_notice("testing in container, skipping %s", __func__);
return; return;
} }
if (!is_inaccessible_available()) { if (!is_inaccessible_available()) {
log_notice("testing without inaccessible, skipping protectkernelmodules tests"); log_notice("testing without inaccessible, skipping %s", __func__);
return; return;
} }
@ -272,7 +272,7 @@ static void test_exec_systemcall_system_mode_with_user(Manager *m) {
else if (getpwnam("nfsnobody")) else if (getpwnam("nfsnobody"))
test(m, "exec-systemcallfilter-system-user-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-systemcallfilter-system-user-nfsnobody.service", 0, CLD_EXITED);
else else
log_error_errno(errno, "Skipping test_exec_systemcall_system_mode_with_user, could not find nobody/nfsnobody user: %m"); log_error_errno(errno, "Skipping %s, could not find nobody/nfsnobody user: %m", __func__);
#endif #endif
} }
@ -282,7 +282,7 @@ static void test_exec_user(Manager *m) {
else if (getpwnam("nfsnobody")) else if (getpwnam("nfsnobody"))
test(m, "exec-user-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-user-nfsnobody.service", 0, CLD_EXITED);
else else
log_error_errno(errno, "Skipping test_exec_user, could not find nobody/nfsnobody user: %m"); log_error_errno(errno, "Skipping %s, could not find nobody/nfsnobody user: %m", __func__);
} }
static void test_exec_group(Manager *m) { static void test_exec_group(Manager *m) {
@ -291,7 +291,7 @@ static void test_exec_group(Manager *m) {
else if (getgrnam("nfsnobody")) else if (getgrnam("nfsnobody"))
test(m, "exec-group-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-group-nfsnobody.service", 0, CLD_EXITED);
else else
log_error_errno(errno, "Skipping test_exec_group, could not find nobody/nfsnobody group: %m"); log_error_errno(errno, "Skipping %s, could not find nobody/nfsnobody group: %m", __func__);
} }
static void test_exec_supplementary_groups(Manager *m) { static void test_exec_supplementary_groups(Manager *m) {
@ -372,7 +372,7 @@ static void test_exec_runtimedirectory(Manager *m) {
else if (getgrnam("nfsnobody")) else if (getgrnam("nfsnobody"))
test(m, "exec-runtimedirectory-owner-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-runtimedirectory-owner-nfsnobody.service", 0, CLD_EXITED);
else else
log_error_errno(errno, "Skipping test_exec_runtimedirectory-owner, could not find nobody/nfsnobody group: %m"); log_error_errno(errno, "Skipping %s, could not find nobody/nfsnobody group: %m", __func__);
} }
static void test_exec_capabilityboundingset(Manager *m) { static void test_exec_capabilityboundingset(Manager *m) {
@ -406,9 +406,9 @@ static void test_exec_capabilityambientset(Manager *m) {
test(m, "exec-capabilityambientset-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-capabilityambientset-nfsnobody.service", 0, CLD_EXITED);
test(m, "exec-capabilityambientset-merge-nfsnobody.service", 0, CLD_EXITED); test(m, "exec-capabilityambientset-merge-nfsnobody.service", 0, CLD_EXITED);
} else } else
log_error_errno(errno, "Skipping test_exec_capabilityambientset, could not find nobody/nfsnobody user: %m"); log_error_errno(errno, "Skipping %s, could not find nobody/nfsnobody user: %m", __func__);
} else } else
log_error_errno(errno, "Skipping test_exec_capabilityambientset, the kernel does not support ambient capabilities: %m"); log_error_errno(errno, "Skipping %s, the kernel does not support ambient capabilities: %m", __func__);
} }
static void test_exec_privatenetwork(Manager *m) { static void test_exec_privatenetwork(Manager *m) {
@ -416,7 +416,7 @@ static void test_exec_privatenetwork(Manager *m) {
r = find_binary("ip", NULL); r = find_binary("ip", NULL);
if (r < 0) { if (r < 0) {
log_error_errno(r, "Skipping test_exec_privatenetwork, could not find ip binary: %m"); log_error_errno(r, "Skipping %s, could not find ip binary: %m", __func__);
return; return;
} }