public inbox for dtrace@lists.linux.dev
 help / color / mirror / Atom feed
From: Nick Alcock <nick.alcock@oracle.com>
To: dtrace@lists.linux.dev, dtrace-devel@oss.oracle.com
Subject: [PATCH 3/5] test: preprocessor: work on GCC 16
Date: Mon,  6 Oct 2025 16:28:26 +0100	[thread overview]
Message-ID: <20251006152829.239100-3-nick.alcock@oracle.com> (raw)
In-Reply-To: <20251006152829.239100-1-nick.alcock@oracle.com>

GCC commit c397a8c12296b75a91ae51e4889debf023e6c338 ("libcpp, genmatch:
Use gcc_diag instead of printf for libcpp diagnostics") made libcpp
quote identifiers and tokens in diagnostics like the rest of GCC does.
We have several tests that rely on the old error formatting: sed away
quotes and smartquotes into quotes or nothing (as appropriate to match
older GCCs), until such time as GCC 15 is obsolete (a long long time
away).

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---
 test/unittest/preprocessor/err.defincomp.r.p   | 1 +
 test/unittest/preprocessor/err.ifdefincomp.r.p | 4 ++++
 test/unittest/preprocessor/err.incompelse.r.p  | 4 ++++
 test/unittest/preprocessor/err.mulelse.r.p     | 1 +
 4 files changed, 10 insertions(+)
 create mode 120000 test/unittest/preprocessor/err.defincomp.r.p
 create mode 100755 test/unittest/preprocessor/err.ifdefincomp.r.p
 create mode 100755 test/unittest/preprocessor/err.incompelse.r.p
 create mode 120000 test/unittest/preprocessor/err.mulelse.r.p

diff --git a/test/unittest/preprocessor/err.defincomp.r.p b/test/unittest/preprocessor/err.defincomp.r.p
new file mode 120000
index 0000000000000..62577fe0b6bbd
--- /dev/null
+++ b/test/unittest/preprocessor/err.defincomp.r.p
@@ -0,0 +1 @@
+err.incompelse.r.p
\ No newline at end of file
diff --git a/test/unittest/preprocessor/err.ifdefincomp.r.p b/test/unittest/preprocessor/err.ifdefincomp.r.p
new file mode 100755
index 0000000000000..7629ac5973957
--- /dev/null
+++ b/test/unittest/preprocessor/err.ifdefincomp.r.p
@@ -0,0 +1,4 @@
+#!/usr/bin/sed -f
+# GCC 16 improved diagnostics formatting.  Until GCC 16 is the minimum
+# supported, we have to sed it back again.
+s,[‘’],",g
diff --git a/test/unittest/preprocessor/err.incompelse.r.p b/test/unittest/preprocessor/err.incompelse.r.p
new file mode 100755
index 0000000000000..ae9a6833d106d
--- /dev/null
+++ b/test/unittest/preprocessor/err.incompelse.r.p
@@ -0,0 +1,4 @@
+#!/usr/bin/sed -f
+# GCC 16 improved diagnostics formatting.  Until GCC 16 is the minimum
+# supported, we have to sed it back again.
+s,[‘’],,g
diff --git a/test/unittest/preprocessor/err.mulelse.r.p b/test/unittest/preprocessor/err.mulelse.r.p
new file mode 120000
index 0000000000000..62577fe0b6bbd
--- /dev/null
+++ b/test/unittest/preprocessor/err.mulelse.r.p
@@ -0,0 +1 @@
+err.incompelse.r.p
\ No newline at end of file
-- 
2.51.0.284.g117bcb8de7


  parent reply	other threads:[~2025-10-06 15:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-06 15:28 [PATCH 1/5] test: fbt return0: work on quiet systems Nick Alcock
2025-10-06 15:28 ` [PATCH 2/5] test: nfs: don't require a locking daemon Nick Alcock
2025-10-06 16:11   ` Kris Van Hees
2025-10-06 15:28 ` Nick Alcock [this message]
2025-10-07 15:08   ` [PATCH 3/5] test: preprocessor: work on GCC 16 Kris Van Hees
2025-10-06 15:28 ` [PATCH 4/5] test: tid_pid: don't assume the type of pthread_t Nick Alcock
2025-10-06 16:13   ` Kris Van Hees
2025-10-06 15:28 ` [PATCH 5/5] test: dupstruct: fix extra duplicate identifier case Nick Alcock
2025-10-06 16:14   ` Kris Van Hees
2025-10-06 16:09 ` [PATCH 1/5] test: fbt return0: work on quiet systems Kris Van Hees
2025-10-07 15:36   ` Nick Alcock
2025-10-08 11:16   ` [PATCH v2 " Nick Alcock
2025-10-08 16:15     ` Kris Van Hees

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=20251006152829.239100-3-nick.alcock@oracle.com \
    --to=nick.alcock@oracle.com \
    --cc=dtrace-devel@oss.oracle.com \
    --cc=dtrace@lists.linux.dev \
    /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