From 1c626358e57fcce2641239025eec0c3703480bfa Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 29 Mar 2022 09:48:27 -0300 Subject: conform: Use -dD instead of -dN on compiler invocation clang does not support -dN. --- conform/conformtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conform/conformtest.py b/conform/conformtest.py index 8337afcdad..d38afb06a8 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 -- cgit v1.2.3