Merge pull request #603 from stinos/windows-tests-newline

tests: Fix handling of newlines from expected output files on windows
2014-05-11 15:03:57 +01:00 · 2014-05-11 15:03:57 +01:00 · c3dcb590b8
parent 18ceb7055b a4dbc73e8a
commit c3dcb590b8
1 changed files with 3 additions and 1 deletions
--- a/tests/run-tests
+++ b/tests/run-tests
@ -44,8 +44,10 @@ def run_tests(pyb, tests):
            # expected output given by a file, so read that in
            with open(test_file_expected, 'rb') as f:
                output_expected = f.read()
+                if os.name == 'nt':
+                    output_expected = output_expected.replace(b'\n', b'\r\n')
        else:
-            # run CPython to work out expeceted output
+            # run CPython to work out expected output
            try:
                output_expected = subprocess.check_output([CPYTHON3, '-B', test_file])
            except subprocess.CalledProcessError: