From 367dbdce367fd504804a1256dc393534d6784bfc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 May 2014 10:18:36 -0400 Subject: Fix the mapping test in continuous It turns out that due to a recent gdm change, the inherited signal mask has SIGUSR1 blocked - which is bad news for tests using SIGUSR1. Fix the test by explicitly checking the signal mask before using SIGUSR1. --- tests/mapping-test.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests') diff --git a/tests/mapping-test.c b/tests/mapping-test.c index e3c45b643..9128e3570 100644 --- a/tests/mapping-test.c +++ b/tests/mapping-test.c @@ -285,6 +285,17 @@ main (int argc, char *argv[]) { int ret; +#ifndef G_OS_WIN32 + sigset_t sig_mask, old_mask; + + sigemptyset (&sig_mask); + sigaddset (&sig_mask, SIGUSR1); + if (sigprocmask (SIG_UNBLOCK, &sig_mask, &old_mask) == 0) + { + if (sigismember (&old_mask, SIGUSR1)) + g_message ("SIGUSR1 was blocked, unblocking it"); + } +#endif dir = g_get_current_dir (); filename = g_build_filename (dir, "maptest", NULL); -- cgit v1.2.3-70-g09d2