From 08fdd5c36c4775e20ec0337f804436645bd1420d Mon Sep 17 00:00:00 2001 From: Francisco Ferreira Date: Fri, 14 Dec 2018 17:22:21 +0000 Subject: [PATCH] Tools: autotest: strip newline chars for comparing mission files Windows is different from other OSes so remove the newline characters before comparing lines when making sure mission files are the same --- Tools/autotest/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py index 29c262e40b..7fe52965bc 100644 --- a/Tools/autotest/common.py +++ b/Tools/autotest/common.py @@ -501,6 +501,8 @@ class AutoTest(ABC): f1 = open(file1) f2 = open(file2) for l1, l2 in itertools.izip(f1, f2): + l1 = l1.rstrip("\r\n") + l2 = l2.rstrip("\r\n") if l1 == l2: # e.g. the first "QGC WPL 110" line continue