From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Feb 2018 14:06:15 +0000 (+0100)
Subject: manager: tweak manager_journal_is_running() a bit regarding test mode
X-Git-Tag: v238~101^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d814a197a11077f7f5a54a9719f91150a10572e;p=platform%2Fupstream%2Fsystemd.git

manager: tweak manager_journal_is_running() a bit regarding test mode

In test mode, let's not consider the journal to be up ever: we want all
output to go to stderr.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 8ae70b6..30a020f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3569,6 +3569,9 @@ static bool manager_journal_is_running(Manager *m) {
 
         assert(m);
 
+        if (m->test_run_flags != 0)
+                return false;
+
         /* If we are the user manager we can safely assume that the journal is up */
         if (!MANAGER_IS_SYSTEM(m))
                 return true;