From 24b03561bdc8715d23684584f5d40afd9d965614 Mon Sep 17 00:00:00 2001 From: stijn Date: Fri, 30 Oct 2015 11:15:46 +0100 Subject: [PATCH] tests: Make sure test output has \r\n line-ends when running on Windows This is the case already when using just subprocess.check_output, but in the special cases (cmdline, meminfo, ...) the carriage return gets lost during output processing so restore it in the end. This fixes the micropython/meminfo.py test on Windows. --- tests/run-tests | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/run-tests b/tests/run-tests index 7df9563137..b275be0064 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -135,6 +135,8 @@ def run_micropython(pyb, args, test_file): if i_mupy >= len(lines_mupy): break output_mupy = b''.join(lines_mupy) + if os.name == 'nt': + output_mupy = output_mupy.replace(b'\n', b'\r\n') else: # a standard test