From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 10ADA3858298; Wed, 30 Aug 2023 12:40:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10ADA3858298 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693399247; bh=5R/w9sxec6mCNYlTMS6qdTea/44oX5qGJkrzL8/0rlc=; h=From:To:Subject:Date:From; b=OHy5aDEsVoWHWBPHCGjbpCIE+KIyDwtGoor2L86RYBwATqruT72e0DfhrV4qo2uYf J+74y8gvFNBXNlNymQt7ob0yrrPqMRT4vfbcFaYC+L5temvZh1KLQhKuYaGq/BeR1R iTNtFbCfNRdelYn4gNHYYiwcxBnT+3j/oULSTsjg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella 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 X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 073e4e86fb2ec971c6f1a0afebeb27be97eb1109 X-Git-Newrev: a48daa4dbbeb8c97615b6779feabaa4ce8226096 Message-Id: <20230830124047.10ADA3858298@sourceware.org> Date: Wed, 30 Aug 2023 12:40:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a48daa4dbbeb8c97615b6779feabaa4ce8226096 commit a48daa4dbbeb8c97615b6779feabaa4ce8226096 Author: Adhemerval Zanella 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 124860da01..fcaab48a6c 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