From 2ce2cce3adf3698fe2ecb06e26f99e0695e046b5 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sun, 3 Jan 2016 15:28:52 +0000
Subject: core: revert "manager: do not set up signals in test mode"

This reverts commit 5aa1054521596c3d268db5f4aff9f2b69647ffc9.

Fixes test-execute
$ sudo make check TESTS=test-execute
...
$ cat test-execute.log
+ test /tmp/test-exec_workingdirectory = /tmp/test-exec_workingdirectory
Test timeout when testing exec-workingdirectory.service
exec-workingdirectory.service
	UMask: 0022
	WorkingDirectory: /tmp/test-exec_workingdirectory
	RootDirectory: /
	NonBlocking: no
	PrivateTmp: no
	PrivateNetwork: no
	PrivateDevices: no
	ProtectHome: no
	ProtectSystem: no
	IgnoreSIGPIPE: yes
	RuntimeDirectoryMode: 0755
	StandardInput: null
	StandardOutput: inherit
	StandardError: inherit
FAIL test-execute (exit status: 1)
---
 src/core/manager.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/core/manager.c b/src/core/manager.c
index 5b17f16ccc..ffe27be743 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -410,9 +410,6 @@ static int manager_setup_signals(Manager *m) {
 
         assert(m);
 
-        if (m->test_run)
-                return 0;
-
         assert_se(sigaction(SIGCHLD, &sa, NULL) == 0);
 
         /* We make liberal use of realtime signals here. On
-- 
cgit v1.2.3-54-g00ecf


From 37453b3a2a68406c0b3c903e85fb1101fab67a44 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Mon, 4 Jan 2016 18:39:55 +0000
Subject: core: don't enable special signals in test mode

Fixes:
$ systemd-analyze verify ...
Failed to open /dev/tty0: Permission denied
---
 src/core/manager.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/core/manager.c b/src/core/manager.c
index ffe27be743..711b0cdcee 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -380,6 +380,9 @@ static int enable_special_signals(Manager *m) {
 
         assert(m);
 
+        if (m->test_run)
+                return 0;
+
         /* Enable that we get SIGINT on control-alt-del. In containers
          * this will fail with EPERM (older) or EINVAL (newer), so
          * ignore that. */
-- 
cgit v1.2.3-54-g00ecf