public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/marxin/heads/PR102742-fix-btest-and-jobserver)] Handle jobserver file descriptors in btest.
Date: Thu, 21 Oct 2021 07:46:38 +0000 (GMT)	[thread overview]
Message-ID: <20211021074638.A0727385803F@sourceware.org> (raw)

https://gcc.gnu.org/g:a5a48835d66843d0f1ab64917681804e9ab49f4c

commit a5a48835d66843d0f1ab64917681804e9ab49f4c
Author: Martin Liska <mliska@suse.cz>
Date:   Thu Oct 21 09:45:33 2021 +0200

    Handle jobserver file descriptors in btest.
    
            PR testsuite/102742
    
    libbacktrace/ChangeLog:
    
            * btest.c (check_open_files): Ignore file descriptors provided
            by jobserver.

Diff:
---
 libbacktrace/btest.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/libbacktrace/btest.c b/libbacktrace/btest.c
index 9f9c03babf3..a1ea93728be 100644
--- a/libbacktrace/btest.c
+++ b/libbacktrace/btest.c
@@ -464,9 +464,25 @@ static void
 check_open_files (void)
 {
   int i;
+  int rfd = -1;
+  int wfd = -1;
+
+#define JS_NEEDLE "--jobserver-auth="
+
+  /* Ignore file descriptors provided by jobserver.  */
+  const char *makeflags = getenv ("MAKEFLAGS");
+  if (makeflags != NULL)
+    {
+      const char *n = strstr (makeflags, JS_NEEDLE);
+      if (n != NULL)
+	sscanf (n + strlen (JS_NEEDLE), "%d,%d", &rfd, &wfd);
+    }
 
   for (i = 3; i < 10; i++)
     {
+      if (i == rfd || i == wfd)
+	continue;
+
       if (close (i) == 0)
 	{
 	  fprintf (stderr,


                 reply	other threads:[~2021-10-21  7:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211021074638.A0727385803F@sourceware.org \
    --to=marxin@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).