diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-29 11:13:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-11-07 13:14:08 +1000 |
| commit | 3390659168e849a07d45cbc236e166ac874def81 (patch) | |
| tree | 7106f15f78e464a1c429a9385d6de333df1b5bf8 | |
| parent | 34727b66dce19c9f4b6fda5b4737ecbb8b324776 (diff) | |
xserver: ignore SIGUSR1 in the parent after server startup
SIGUSR1 is triggered on server regeneration too, not just on startup. And
any test that wants to handle SIGUSR1 for other stuff needs to set a signal
handler anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/xserver.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xserver.cpp b/src/xserver.cpp index 0c8f342..ad018a1 100644 --- a/src/xserver.cpp +++ b/src/xserver.cpp @@ -489,6 +489,10 @@ void xorg::testing::XServer::Start(const std::string &program) { sigaddset(&sig_mask, SIGUSR1); sigprocmask(SIG_UNBLOCK, &sig_mask, NULL); + /* Ignore SIGUSR1, it's triggered on server regeneration. Tests that need + * to handle SIGUSR1 will have to install their own signal handler anyways */ + signal(SIGUSR1 ,SIG_IGN); + RegisterXIOErrorHandler(); } |