]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: make sure test-execute can run in a read-only environment
authorLennart Poettering <lennart@poettering.net>
Tue, 20 Dec 2016 23:58:08 +0000 (00:58 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Dec 2016 18:09:32 +0000 (19:09 +0100)
This makes sure we can invoke it safely from out "mkosi.build" script
when mkosi is invoked for a read-only image.

src/test/test-execute.c

index 4670458ffb87091f01ffc9c6e19f124ab1b6c2d3..3254f0f23157d15887f5bd4779746479dc49ded2 100644 (file)
@@ -33,6 +33,7 @@
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
 #endif
+#include "stat-util.h"
 #include "test-helper.h"
 #include "unit.h"
 #include "util.h"
@@ -188,15 +189,27 @@ static void test_exec_protectkernelmodules(Manager *m) {
 }
 
 static void test_exec_readonlypaths(Manager *m) {
+
+        if (path_is_read_only_fs("/var") > 0)
+                return;
+
         test(m, "exec-readonlypaths.service", 0, CLD_EXITED);
         test(m, "exec-readonlypaths-mount-propagation.service", 0, CLD_EXITED);
 }
 
 static void test_exec_readwritepaths(Manager *m) {
+
+        if (path_is_read_only_fs("/") > 0)
+                return;
+
         test(m, "exec-readwritepaths-mount-propagation.service", 0, CLD_EXITED);
 }
 
 static void test_exec_inaccessiblepaths(Manager *m) {
+
+        if (path_is_read_only_fs("/") > 0)
+                return;
+
         test(m, "exec-inaccessiblepaths-mount-propagation.service", 0, CLD_EXITED);
 }