run-tests: handle windows crlf in .py tests again
authorMads Kiilerich <mads@kiilerich.com>
Thu, 18 Oct 2012 00:33:29 +0200
changeset 17800 f3c36faa7374
parent 17799 327fbe0b84fd
child 17801 03554dfc7ced
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.
tests/run-tests.py
--- a/tests/run-tests.py	Thu Oct 18 00:33:26 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):