[glib] Fix the mapping test in continuous



commit 367dbdce367fd504804a1256dc393534d6784bfc
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 30 10:18:36 2014 -0400

    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 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/tests/mapping-test.c b/tests/mapping-test.c
index e3c45b6..9128e35 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]