mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-03 21:49:32 +01:00 
			
		
		
		
	Approval tests now can deal with different expansions of errno
This commit is contained in:
		@@ -36,6 +36,13 @@ exeNameParser = re.compile(r'''
 | 
				
			|||||||
# This is a hack until something more reasonable is figured out
 | 
					# This is a hack until something more reasonable is figured out
 | 
				
			||||||
specialCaseParser = re.compile(r'file\((\d+)\)')
 | 
					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:
 | 
					if len(sys.argv) == 2:
 | 
				
			||||||
    cmdPath = sys.argv[1]
 | 
					    cmdPath = sys.argv[1]
 | 
				
			||||||
else:
 | 
					else:
 | 
				
			||||||
@@ -90,6 +97,7 @@ def filterLine(line):
 | 
				
			|||||||
    line = durationsParser.sub(' time="{duration}"', line)
 | 
					    line = durationsParser.sub(' time="{duration}"', line)
 | 
				
			||||||
    line = timestampsParser.sub(' timestamp="{iso8601-timestamp}"', line)
 | 
					    line = timestampsParser.sub(' timestamp="{iso8601-timestamp}"', line)
 | 
				
			||||||
    line = specialCaseParser.sub('file:\g<1>', line)
 | 
					    line = specialCaseParser.sub('file:\g<1>', line)
 | 
				
			||||||
 | 
					    line = errnoParser.sub('errno', line)
 | 
				
			||||||
    return line
 | 
					    return line
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user