From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Dec 2016 23:58:08 +0000 (+0100)
Subject: test: make sure test-execute can run in a read-only environment
X-Git-Tag: v233~237^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34b86909b721e552eff90ca20d2ade754ebe3e04;p=thirdparty%2Fsystemd.git

test: make sure test-execute can run in a read-only environment

This makes sure we can invoke it safely from out "mkosi.build" script
when mkosi is invoked for a read-only image.
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 4670458ffb8..3254f0f2315 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -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);
 }