summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-28 13:07:48 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-28 13:07:48 +0100
commit8918103d1ec2db3d0e317d3af773afe0912edb07 (patch)
tree67da07360b915133412acf5e2620633c425f3a7c
parente3d285e6c0fb5a63e48d97f9bec1ba6d4ec132aa (diff)
parentcc7fa4fb4a64682f36f07db9c286ec3fb0477a65 (diff)
Merge pull request #1703 from ronnychevalier/rc/test_execute_check_nobody2
test-execute: check if nobody exists before running some tests
-rw-r--r--src/test/test-execute.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index cdbfe6698e..dcd298d571 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -18,6 +18,9 @@
***/
#include <stdio.h>
+#include <sys/types.h>
+#include <grp.h>
+#include <pwd.h>
#include "fs-util.h"
#include "macro.h"
@@ -124,11 +127,13 @@ static void test_exec_systemcallerrornumber(Manager *m) {
}
static void test_exec_user(Manager *m) {
- test(m, "exec-user.service", 0, CLD_EXITED);
+ if (getpwnam("nobody"))
+ test(m, "exec-user.service", 0, CLD_EXITED);
}
static void test_exec_group(Manager *m) {
- test(m, "exec-group.service", 0, CLD_EXITED);
+ if (getgrnam("nobody"))
+ test(m, "exec-group.service", 0, CLD_EXITED);
}
static void test_exec_environment(Manager *m) {
@@ -145,7 +150,8 @@ static void test_exec_umask(Manager *m) {
static void test_exec_runtimedirectory(Manager *m) {
test(m, "exec-runtimedirectory.service", 0, CLD_EXITED);
test(m, "exec-runtimedirectory-mode.service", 0, CLD_EXITED);
- test(m, "exec-runtimedirectory-owner.service", 0, CLD_EXITED);
+ if (getgrnam("nobody"))
+ test(m, "exec-runtimedirectory-owner.service", 0, CLD_EXITED);
}
int main(int argc, char *argv[]) {