Attachment 135765 Details for Bug 100317 – [8] _dbus_test_oom_handling: print TAP diagnostics

[patch] [8] _dbus_test_oom_handling: print TAP diagnostics

0008-_dbus_test_oom_handling-print-TAP-diagnostics.patch (text/plain), 2.53 KB, created by Simon McVittie on 2017-11-28 14:37:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-11-28 14:37:29 UTC

Size: 2.53 KB

patch

obsolete

>From 89feffb5171bc161b1013e11e361a36f09515763 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 28 Nov 2017 13:29:58 +0000
>Subject: [PATCH 8/9] _dbus_test_oom_handling: print TAP diagnostics
>
>These aren't *that* verbose, so it seems OK to print them all the time,
>not just in the needlessly spammy verbose mode.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-internals.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
>diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
>index a20a5395..126e3e4b 100644
>--- a/dbus/dbus-internals.c
>+++ b/dbus/dbus-internals.c
>@@ -26,6 +26,7 @@
> #include "dbus-protocol.h"
> #include "dbus-marshal-basic.h"
> #include "dbus-test.h"
>+#include "dbus-test-tap.h"
> #include "dbus-valgrind-internal.h"
> #include <stdio.h>
> #include <stdarg.h>
>@@ -1044,15 +1045,15 @@ _dbus_test_oom_handling (const char             *description,
>   
>   _dbus_set_fail_alloc_counter (_DBUS_INT_MAX);
> 
>-  _dbus_verbose ("Running once to count mallocs\n");
>-  
>+  _dbus_test_diag ("Running \"%s\" once to count mallocs", description);
>+
>   if (!(* func) (data, TRUE))
>     return FALSE;
>-  
>+
>   approx_mallocs = _DBUS_INT_MAX - _dbus_get_fail_alloc_counter ();
> 
>-  _dbus_verbose ("\n=================\n%s: about %d mallocs total\n=================\n",
>-                 description, approx_mallocs);
>+  _dbus_test_diag ("\"%s\" has about %d mallocs in total",
>+                   description, approx_mallocs);
> 
>   setting = _dbus_getenv ("DBUS_TEST_MALLOC_FAILURES");
>   if (setting != NULL)
>@@ -1072,21 +1073,26 @@ _dbus_test_oom_handling (const char             *description,
> 
>   if (max_failures_to_try < 1)
>     {
>-      _dbus_verbose ("not testing OOM handling\n");
>+      _dbus_test_diag ("not testing OOM handling");
>       return TRUE;
>     }
> 
>+  _dbus_test_diag ("testing \"%s\" with up to %d consecutive malloc failures",
>+                   description, max_failures_to_try);
>+
>   i = setting ? max_failures_to_try - 1 : 1;
>   while (i < max_failures_to_try)
>     {
>+      _dbus_test_diag ("testing \"%s\" with %d consecutive malloc failures",
>+                       description, i + 1);
>+
>       _dbus_set_fail_alloc_failures (i);
>       if (!run_failing_each_malloc (approx_mallocs, description, func, data))
>         return FALSE;
>       ++i;
>     }
>   
>-  _dbus_verbose ("\n=================\n%s: all iterations passed\n=================\n",
>-                 description);
>+  _dbus_verbose ("\"%s\" coped OK with malloc failures", description);
> 
>   return TRUE;
> }
>-- 
>2.15.0
>

Actions: View | Splinter Review

Attachments on bug 100317: 135758 | 135759 | 135760 | 135761 | 135762 | 135763 | 135764 | 135765 | 135766 | 135863 | 135864 | 135865 | 136098 | 136099 | 136100 | 136101 | 136102 | 136103 | 136104 | 136106 | 136107 | 136108 | 136287 | 136288 | 136289 | 136290 | 136296 | 136297

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.