diff options
| author | David Robillard <d@drobilla.net> | 2019-03-18 13:05:08 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-03-18 13:19:04 +0100 |
| commit | cddbcb577dad255414b6454d8680a6cd80ad7458 (patch) | |
| tree | cf803b73938d32e790ba1e0fd7c90b59b26dd7d5 | |
| parent | 6e4e92b0bd871033af80d2ba5c0480807f7d6ca2 (diff) | |
| download | autowaf-cddbcb577dad255414b6454d8680a6cd80ad7458.tar.gz autowaf-cddbcb577dad255414b6454d8680a6cd80ad7458.tar.bz2 autowaf-cddbcb577dad255414b6454d8680a6cd80ad7458.zip | |
Pass file comparison test if difflib finds no changes
The Python filecmp module seems to be a bit flaky on some platforms, so with
this change the test only fails if actual visible changes are printed.
| -rw-r--r-- | extras/autowaf.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py index c28cc1a..d779967 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -807,11 +807,15 @@ def show_diff(from_lines, to_lines, from_filename, to_filename): import difflib import sys + same = True for line in difflib.unified_diff( from_lines, to_lines, fromfile=os.path.abspath(from_filename), tofile=os.path.abspath(to_filename)): sys.stderr.write(line) + same = False + + return same def test_file_equals(patha, pathb): import filecmp @@ -827,9 +831,7 @@ def test_file_equals(patha, pathb): with io.open(patha, 'rU', encoding='utf-8') as fa: with io.open(pathb, 'rU', encoding='utf-8') as fb: - show_diff(fa.readlines(), fb.readlines(), patha, pathb) - - return False + return show_diff(fa.readlines(), fb.readlines(), patha, pathb) def bench_time(): if hasattr(time, 'perf_counter'): # Added in Python 3.3 |