summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-01-04 14:10:13 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-01-04 14:10:13 -0500
commitd7a2f11bb964da382d6e5c30a15fd11ac74b50d7 (patch)
treee842d1bda32ed04efed5f3431a338696ffe9940c
parent393ebb8f3e9f7262d334d28f91c5a10c427734d8 (diff)
parent37453b3a2a68406c0b3c903e85fb1101fab67a44 (diff)
Merge pull request #2259 from evverx/fix-test-execute
core: only skip setup of "special" signals in test mode
-rw-r--r--src/core/manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 5b17f16ccc..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. */
@@ -410,9 +413,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