Fix this test on Solaris. There can be embedded \r, so don't just replace

the one at the end.
This commit is contained in:
Neal Norwitz 2006-04-26 06:26:12 +00:00
parent 57a0361a9e
commit 9cc3b1ccef
1 changed files with 2 additions and 2 deletions

View File

@ -24,11 +24,11 @@ def normalize_output(data):
# OSF/1 (Tru64) apparently turns \n into \r\r\n.
if data.endswith('\r\r\n'):
return data[:-3] + '\n'
return data.replace('\r\r\n', '\n')
# IRIX apparently turns \n into \r\n.
if data.endswith('\r\n'):
return data[:-2] + '\n'
return data.replace('\r\n', '\n')
return data