diff options
author | Sergio Martins <smartins@kde.org> | 2019-10-08 10:25:46 +0100 |
---|---|---|
committer | Sergio Martins <smartins@kde.org> | 2019-10-08 10:25:46 +0100 |
commit | 5d5448ebdfa623d115777bc489929d453b1aed03 (patch) | |
tree | 5f0899a4c9c4365b999446ccfd27cdeec2f8ee73 | |
parent | 7616ce83efd24c56204d203d138bfb6cdaba7055 (diff) |
tests: Fix calling diff on Windows due to line-endings
We need to normalize line endings before comparing
-rwxr-xr-x | tests/run_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/run_tests.py b/tests/run_tests.py index 8e871b33..1cbfe66a 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -523,7 +523,7 @@ def cleanup_fixit_files(checks): def print_differences(file1, file2): # Returns true if the the files are equal - return run_command("diff -Naur {} {}".format(file1, file2)) + return run_command("diff -Naur --strip-trailing-cr {} {}".format(file1, file2)) def normalizedCwd(): return os.getcwd().replace('\\', '/') |