# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2012-10-17 22:33:29
# Node ID f3c36faa737424b5e55b8effa93d1ea842987948
# Parent  327fbe0b84fd3203d18d6e166fbf29063d636e33

run-tests: handle windows crlf in .py tests again

Before af7c6bc48d8d all crlf occurrences in test output on Windows were simply
changed to lf. In af7c6bc48d8d it was replaced by more clever handling in the
.t test runner ... but the .py runner was forgotten and many .py tests were
failing on Windows.

The crlf/lf replacement is now reintroduced in the py test runner.

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -476,6 +476,8 @@ def pytest(test, wd, options, replacemen
     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)
 
 def shtest(test, wd, options, replacements):