Mercurial > public > mercurial-scm > hg-stable
diff tests/run-tests.py @ 17777:af7c6bc48d8d
run-tests: alternative way of handling \r on Windows
After f71d60da58fb all \r was stripped from output on Windows, and the places
where a \r explicitly was expected it was accepted that it was missing. Ugly
hack.
Instead we now accept that an extra \r might appear at the end of lines on
Windows. That is more to the point and less ugly.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 15 Oct 2012 02:33:12 +0200 |
| parents | 4871c1f343fa |
| children | 80fe64581f3a |
line wrap: on
line diff
--- a/tests/run-tests.py Tue Oct 16 15:39:12 2012 +0200 +++ b/tests/run-tests.py Mon Oct 15 02:33:12 2012 +0200 @@ -494,8 +494,10 @@ def rematch(el, l): try: - # ensure that the regex matches to the end of the string - return re.match(el + r'\Z', l) + # 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 return False @@ -525,12 +527,12 @@ if el == l: # perfect match (fast) return True if (el and - (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or - el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l) or + (el.endswith(" (re)\n") and rematch(el[:-6], l) or + el.endswith(" (glob)\n") and globmatch(el[:-8], l) or el.endswith(" (esc)\n") and (el[:-7].decode('string-escape') + '\n' == l or - el[:-7].decode('string-escape').replace('\r', '') + - '\n' == l and os.name == 'nt'))): + os.name == 'nt' and + el[:-7].decode('string-escape') + '\n' == l))): return True return False @@ -885,7 +887,6 @@ (r':%s\b' % (options.port + 2), ':$HGPORT2'), ] if os.name == 'nt': - replacements.append((r'\r\n', '\n')) replacements.append( (''.join(c.isalpha() and '[%s%s]' % (c.lower(), c.upper()) or c in '/\\' and r'[/\\]' or