Attachment 133432 Details for Bug 101221 – Updated patch

[patch] Updated patch

fdpass.patch (text/plain), 1.19 KB, created by Alan Coopersmith on 2017-08-11 04:16:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2017-08-11 04:16:08 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/test/fdpass.c b/test/fdpass.c
>index 0ea7518c..1bcd9cab 100644
>--- a/test/fdpass.c
>+++ b/test/fdpass.c
>@@ -857,9 +857,22 @@ main (int argc,
>            * for stdout, stderr, duplicates, the D-Bus connection, etc. */
>           lim.rlim_cur < 2 * MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES)
>         {
>-          g_message ("not enough RLIMIT_NOFILE to run this test");
>-          /* Autotools exit code for "all skipped" */
>-          return 77;
>+          if (lim.rlim_max >= 2 * MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES)
>+            {
>+              lim.rlim_cur = 2 * MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES;
>+              if ((lim.rlim_cur < 4 * TOO_MANY_FDS) &&
>+                  (lim.rlim_max >= 4 * TOO_MANY_FDS))
>+                lim.rlim_cur = 4 * TOO_MANY_FDS;
>+              if (setrlimit (RLIMIT_NOFILE, &lim) < 0)
>+                g_error ("Failed to set RLIMIT_NOFILE limit to %lu: %s",
>+                    (unsigned long) lim.rlim_cur, g_strerror (errno));
>+            }
>+          else
>+            {
>+              g_message ("not enough RLIMIT_NOFILE to run this test");
>+              /* Autotools exit code for "all skipped" */
>+              return 77;
>+            }
>         }
>     }
> #endif

Actions: View | Splinter Review

Attachments on bug 101221: 131553 | 133432

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.