From 2ce2cce3adf3698fe2ecb06e26f99e0695e046b5 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin 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(-) 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