corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 968044 - prevent xpcshell test output from escaping CR chars. r=gps

Browse Source
This commit is contained in:
Mark Hammond
2014-02-10 09:23:02 +11:00
parent b0a6817d16
commit 12fb061fa6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testing/xpcshell/runxpcshelltests.py
View File

@@ -77,9 +77,9 @@ import mozinfo
# TODO: perhaps this should be in a more generally shared location? # TODO: perhaps this should be in a more generally shared location?
# This regex matches all of the C0 and C1 control characters # This regex matches all of the C0 and C1 control characters
# (U+0000 through U+001F; U+007F; U+0080 through U+009F), # (U+0000 through U+001F; U+007F; U+0080 through U+009F),
# except TAB (U+0009) and LF (U+000A); also, backslash (U+005C). # except TAB (U+0009), CR (U+000D), LF (U+000A) and backslash (U+005C).
# A raw string is deliberately not used. # A raw string is deliberately not used.
_cleanup_encoding_re = re.compile(u'[\x00-\x08\x0b-\x1f\x7f-\x9f\\\\]') _cleanup_encoding_re = re.compile(u'[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\x9f\\\\]')
def _cleanup_encoding_repl(m): def _cleanup_encoding_repl(m):
c = m.group(0) c = m.group(0)
return '\\\\' if c == '\\' else '\\x{:02X}'.format(ord(c)) return '\\\\' if c == '\\' else '\\x{:02X}'.format(ord(c))