Show More
@@ -578,6 +578,8 b' def pytest(test, wd, options, replacemen' | |||
|
578 | 578 | py3kswitch = options.py3k_warnings and ' -3' or '' |
|
579 | 579 | cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test) |
|
580 | 580 | vlog("# Running", cmd) |
|
581 | if os.name == 'nt': | |
|
582 | replacements.append((r'\r\n', '\n')) | |
|
581 | 583 | return run(cmd, wd, options, replacements, env) |
|
582 | 584 | |
|
583 | 585 | needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search |
@@ -592,6 +594,8 b' def stringescape(s):' | |||
|
592 | 594 | def rematch(el, l): |
|
593 | 595 | try: |
|
594 | 596 | # use \Z to ensure that the regex matches to the end of the string |
|
597 | if os.name == 'nt': | |
|
598 | return re.match(el + r'\r?\n\Z', l) | |
|
595 | 599 | return re.match(el + r'\n\Z', l) |
|
596 | 600 | except re.error: |
|
597 | 601 | # el is an invalid regex |
@@ -629,6 +633,8 b' def linematch(el, l):' | |||
|
629 | 633 | if el: |
|
630 | 634 | if el.endswith(" (esc)\n"): |
|
631 | 635 | el = el[:-7].decode('string-escape') + '\n' |
|
636 | if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l: | |
|
637 | return True | |
|
632 | 638 | if (el.endswith(" (re)\n") and rematch(el[:-6], l) or |
|
633 | 639 | el.endswith(" (glob)\n") and globmatch(el[:-8], l)): |
|
634 | 640 | return True |
@@ -947,7 +953,6 b' def runone(options, test, count):' | |||
|
947 | 953 | c.isdigit() and c or |
|
948 | 954 | '\\' + c |
|
949 | 955 | for c in testtmp), '$TESTTMP')) |
|
950 | replacements.append((r'\r\n', '\n')) | |
|
951 | 956 | else: |
|
952 | 957 | replacements.append((re.escape(testtmp), '$TESTTMP')) |
|
953 | 958 |
General Comments 0
You need to be logged in to leave comments.
Login now