From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id E13BA3857C4F; Thu, 9 Feb 2023 19:52:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E13BA3857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675972362; bh=kH8dHe0TVE4lA9kOFRW60mqjTw3stm5s4YKZ5Cntzwo=; h=From:To:Subject:Date:From; b=KaFUNDNtj3SSqkhxcqWTmUjNnXJ42EYl3GCWBuKMqEvaztTIres5Ph4O47ehdda81 Zb4m+dZfQ3W7m553qXq57kVqENqVCnALfR0jdCY5gV6iW78WFUrY/jyD35xpmNlySf vCCQ3LC7tEI4yQVwL1l0wMqceynceck/tkFsqG3Y= 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: 1b96c75d7ba2b764aa556cf747cb60b5dda60c62 X-Git-Newrev: ef19d516b1fa739276f08f117bbe2b97e9391e14 Message-Id: <20230209195242.E13BA3857C4F@sourceware.org> Date: Thu, 9 Feb 2023 19:52:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ef19d516b1fa739276f08f117bbe2b97e9391e14 commit ef19d516b1fa739276f08f117bbe2b97e9391e14 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