From a3ceb8f007266d9bb3fbfa5dc1b77108adbbd781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 29 Apr 2017 17:52:12 +0200 Subject: [PATCH] Approval tests now can deal with different expansions of errno --- scripts/approvalTests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py index b1b1d65d..0b0d036c 100755 --- a/scripts/approvalTests.py +++ b/scripts/approvalTests.py @@ -36,6 +36,13 @@ exeNameParser = re.compile(r''' # This is a hack until something more reasonable is figured out specialCaseParser = re.compile(r'file\((\d+)\)') +# errno macro expands into various names depending on platform, so we need to fix them up as well +errnoParser = re.compile(r''' + \(\*__errno_location\ \(\)\) + | + \(\*__error\(\)\) +''', re.VERBOSE) + if len(sys.argv) == 2: cmdPath = sys.argv[1] else: @@ -90,6 +97,7 @@ def filterLine(line): line = durationsParser.sub(' time="{duration}"', line) line = timestampsParser.sub(' timestamp="{iso8601-timestamp}"', line) line = specialCaseParser.sub('file:\g<1>', line) + line = errnoParser.sub('errno', line) return line