From: Simon McVittie <smcv@collabora.com>
Date: Thu, 12 Jul 2018 14:28:54 +0000 (+0100)
Subject: Don't do OOM testing under valgrind by default
X-Git-Tag: dbus-1.13.6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=375bffed7b75e59dc32fedd78e0c918586f26cbd;p=thirdparty%2Fdbus.git

Don't do OOM testing under valgrind by default

It's just painfully slow, particularly when we fork (as we do in
test-bus to test service activation).

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194
---

diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 061c527bf..b1c895204 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -1056,6 +1056,7 @@ _dbus_test_oom_handling (const char             *description,
                    description, approx_mallocs);
 
   setting = _dbus_getenv ("DBUS_TEST_MALLOC_FAILURES");
+
   if (setting != NULL)
     {
       DBusString str;
@@ -1071,6 +1072,14 @@ _dbus_test_oom_handling (const char             *description,
       max_failures_to_try = 4;
     }
 
+  if (RUNNING_ON_VALGRIND && _dbus_getenv ("DBUS_TEST_SLOW") == NULL)
+    {
+      /* The full OOM testing is slow, valgrind is slow, so the
+       * combination is just horrible. Only do this if the user
+       * asked for extra-slow tests. */
+      max_failures_to_try = 0;
+    }
+
   if (max_failures_to_try < 1)
     {
       _dbus_test_diag ("not testing OOM handling");