Attachment 134501 Details for Bug 103009 – test-utils-glib: Try to emit TAP diagnostics before aborting

[patch] test-utils-glib: Try to emit TAP diagnostics before aborting

0001-test-utils-glib-Try-to-emit-TAP-diagnostics-before-a.patch (text/plain), 2.22 KB, created by Simon McVittie on 2017-09-27 12:47:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-09-27 12:47:31 UTC

Size: 2.22 KB

patch

obsolete

>From a2246e32888646b2a31432b956a9a7c3cdeb95f6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 27 Sep 2017 13:14:36 +0100
>Subject: [PATCH 1/2] test-utils-glib: Try to emit TAP diagnostics before
> aborting
>
>We can't use normal I/O in a signal handler, so resort to write().
>
>"Bail out!" is a special syntactic token in TAP. If I artifically force
>the tests to time out by reducing timeouts and increasing the number of
>operations, I get results like this:
>
>ERROR: test-sd-activation - Bail out! Test timed out (GLib main loop timeout callback reached)
>ERROR: test-refs - Bail out! Test timed out (SIGALRM received)
>
>which is a lot easier to understand than "Not enough tests run" or
>"nonzero exit status". The differing output is because test-sd-activation
>iterates the main loop, whereas test-refs just blocks (it is joining a
>series of worker threads, each of which is spamming refcount operations).
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/test-utils-glib.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c
>index bb481952..2d005ad9 100644
>--- a/test/test-utils-glib.c
>+++ b/test/test-utils-glib.c
>@@ -459,7 +459,9 @@ test_kill_pid (GPid pid)
> static gboolean
> time_out (gpointer data)
> {
>-  g_error ("timed out");
>+  puts ("Bail out! Test timed out (GLib main loop timeout callback reached)");
>+  fflush (stdout);
>+  abort ();
>   return FALSE;
> }
> 
>@@ -469,6 +471,15 @@ static void wrap_abort (int signal) _DBUS_GNUC_NORETURN;
> static void
> wrap_abort (int signal)
> {
>+  /* We might be halfway through writing out something else, so force this
>+   * onto its own line */
>+  const char message [] = "\nBail out! Test timed out (SIGALRM received)\n";
>+
>+  if (write (1, message, sizeof (message) - 1) < (ssize_t) sizeof (message) - 1)
>+    {
>+      /* ignore short write - what would we do about it? */
>+    }
>+
>   abort ();
> }
> #endif
>@@ -490,7 +501,7 @@ test_init (int *argcp, char ***argvp)
>    * test). Die with SIGALRM shortly after if necessary. */
>   alarm (TIMEOUT + 10);
> 
>-  /* Get a core dump from the SIGALRM. */
>+  /* Get a log message and a core dump from the SIGALRM. */
>     {
>       struct sigaction act = { };
> 
>-- 
>2.14.2
>

Actions: View | Splinter Review

Attachments on bug 103009: 134501 | 134502

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.