Commit 375bffed authored by Simon McVittie's avatar Simon McVittie

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's avatarSimon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194
parent bbe79351
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment