]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: revert "manager: do not set up signals in test mode"
authorEvgeny Vereshchagin <evvers@ya.ru>
Sun, 3 Jan 2016 15:28:52 +0000 (15:28 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Mon, 4 Jan 2016 04:13:00 +0000 (04:13 +0000)
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

index 5b17f16cccfa3e8276bec1b46c61adcd1edf26a3..ffe27be7432fefa39f79bfa49639747f89f04ac5 100644 (file)
@@ -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