importd: add new bus calls for importing local tar and raw images

[elogind.git] / src / test / test-execute.c

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 69368b177b1ce3fb34a37aa0938631381370ca6b..428fd3260035cf59b102af2d4f0545a0ec0932d7 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -23,7 +23,6 @@
 #include "manager.h"
 #include "util.h"
 #include "macro.h"
-#include "strv.h"
 #include "mkdir.h"
 
 typedef void (*test_function_t)(Manager *m);
@@ -90,10 +89,6 @@ static void test_exec_ignoresigpipe(Manager *m) {
 }
 
 static void test_exec_privatetmp(Manager *m) {
-        if (getuid() != 0) {
-                printf("Skipping test_exec_privatetmp: not root\n");
-                return;
-        }
         assert_se(touch("/tmp/test-exec_privatetmp") >= 0);
 
         test(m, "exec-privatetmp-yes.service", 0, CLD_EXITED);
@@ -103,10 +98,6 @@ static void test_exec_privatetmp(Manager *m) {
 }
 
 static void test_exec_privatedevices(Manager *m) {
-        if (getuid() != 0) {
-                printf("Skipping test_exec_privatedevices: not root\n");
-                return;
-        }
         test(m, "exec-privatedevices-yes.service", 0, CLD_EXITED);
         test(m, "exec-privatedevices-no.service", 0, CLD_EXITED);
 }
@@ -127,18 +118,10 @@ static void test_exec_systemcallerrornumber(Manager *m) {
 }
 
 static void test_exec_user(Manager *m) {
-        if (getuid() != 0) {
-                printf("Skipping test_exec_user: not root\n");
-                return;
-        }
         test(m, "exec-user.service", 0, CLD_EXITED);
 }
 
 static void test_exec_group(Manager *m) {
-        if (getuid() != 0) {
-                printf("Skipping test_exec_group: not root\n");
-                return;
-        }
         test(m, "exec-group.service", 0, CLD_EXITED);
 }
 
@@ -149,10 +132,6 @@ static void test_exec_environment(Manager *m) {
 }
 
 static void test_exec_umask(Manager *m) {
-        if (getuid() != 0) {
-                printf("Skipping test_exec_umask: not root\n");
-                return;
-        }
         test(m, "exec-umask-default.service", 0, CLD_EXITED);
         test(m, "exec-umask-0177.service", 0, CLD_EXITED);
 }
@@ -179,6 +158,12 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
+        /* It is needed otherwise cgroup creation fails */
+        if (getuid() != 0) {
+                printf("Skipping test: not root\n");
+                return EXIT_TEST_SKIP;
+        }
+
         assert_se(set_unit_path(TEST_DIR ":") >= 0);
 
         r = manager_new(SYSTEMD_USER, true, &m);