From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
 id D50F6384F01D; Thu,  9 Jun 2022 21:24:35 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D50F6384F01D
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/azanella/clang] conform: Use -dD instead of -dN on compiler
 invocation
X-Act-Checkin: glibc
X-Git-Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
X-Git-Refname: refs/heads/azanella/clang
X-Git-Oldrev: caa636c51c43490c42f37681553eaf1bde05165a
X-Git-Newrev: 7db234a045f286805611e03606d2aa2d64bc437f
Message-Id: <20220609212435.D50F6384F01D@sourceware.org>
Date: Thu,  9 Jun 2022 21:24:35 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2022 21:24:35 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7db234a045f286805611e03606d2aa2d64bc437f

commit 7db234a045f286805611e03606d2aa2d64bc437f
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Tue Mar 29 09:48:27 2022 -0300

    conform: Use -dD instead of -dN on compiler invocation
    
    clang does not support -dN.

Diff:
---
 conform/conformtest.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conform/conformtest.py b/conform/conformtest.py
index 94a7ee110f..3d2b9cec03 100644
--- a/conform/conformtest.py
+++ b/conform/conformtest.py
@@ -620,7 +620,7 @@ class HeaderTests(object):
         out_file = os.path.join(self.temp_dir, 'namespace-out')
         with open(c_file, 'w') as c_file_out:
             c_file_out.write('#include <%s>\n' % self.header)
-        cmd = ('%s %s -E %s -P -Wp,-dN > %s'
+        cmd = ('%s %s -E %s -P -Wp,-dD > %s'
                % (self.cc, self.cflags_namespace, c_file, out_file))
         subprocess.check_call(cmd, shell=True)
         bad_tokens = set()
@@ -639,11 +639,11 @@ class HeaderTests(object):
                     # macros defined by user code including the
                     # header.)
                     continue
-                match = re.match(r'#define (.*)', line)
+                match = re.match(r'#define (.*?[^\(\s]+)', line)
                 if match:
                     self.check_token(bad_tokens, match.group(1))
                     continue
-                match = re.match(r'#undef (.*)', line)
+                match = re.match(r'#undef (.*?[^\(\s]+)', line)
                 if match:
                     bad_tokens.discard(match.group(1))
                     continue