Skip to content
Snippets Groups Projects
Commit 4f327478 authored by Simon Heimberg's avatar Simon Heimberg
Browse files

run-tests: generally handle line endings on windows by re

Recently this regexp was only appended when running a python test. When running
a tsttest there was a separate handling for each line type. Simplify and unify
this.
parent e823abe5
Branches
Tags
No related merge requests found
......@@ -578,8 +578,6 @@
py3kswitch = options.py3k_warnings and ' -3' or ''
cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
vlog("# Running", cmd)
if os.name == 'nt':
replacements.append((r'\r\n', '\n'))
return run(cmd, wd, options, replacements, env)
needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
......@@ -594,8 +592,6 @@
def rematch(el, l):
try:
# use \Z to ensure that the regex matches to the end of the string
if os.name == 'nt':
return re.match(el + r'\r?\n\Z', l)
return re.match(el + r'\n\Z', l)
except re.error:
# el is an invalid regex
......@@ -633,8 +629,6 @@
if el:
if el.endswith(" (esc)\n"):
el = el[:-7].decode('string-escape') + '\n'
if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l:
return True
if (el.endswith(" (re)\n") and rematch(el[:-6], l) or
el.endswith(" (glob)\n") and globmatch(el[:-8], l)):
return True
......@@ -953,6 +947,7 @@
c.isdigit() and c or
'\\' + c
for c in testtmp), '$TESTTMP'))
replacements.append((r'\r\n', '\n'))
else:
replacements.append((re.escape(testtmp), '$TESTTMP'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment