run-tests: handle windows crlf in .py tests again stable
authorMads Kiilerich <mads@kiilerich.com>
Thu, 18 Oct 2012 00:33:29 +0200
branchstable
changeset 1151 676dce49d8e6
parent 1150 feb29f7d0066
child 1152 9a4ed3acf89e
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 ]
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):