# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1350513209 -7200
# Node ID 676dce49d8e6e3a04160425af675240bcf729459
# Parent  feb29f7d0066d26a45db802835c057c8b46feacb
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.

[ original upstream message ]

diff -r feb29f7d0066 -r 676dce49d8e6 tests/run-tests.py
--- a/tests/run-tests.py	Sun Oct 14 18:30:42 2012 +0200
+++ b/tests/run-tests.py	Thu Oct 18 00:33:29 2012 +0200
@@ -476,6 +476,8 @@
     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):