X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-test.git;a=blobdiff_plain;f=decoder%2Fpdtest;fp=decoder%2Fpdtest;h=59483253c86eab67bf6f5322c088827bb492e5cd;hp=e3509b967176730588183ac9c8388675c96bdb36;hb=6a789f0afcc5894a81e3f56e11883f1446d46e7b;hpb=7d97c1424a7b39ccdf37128d66fb6632baf8f523 diff --git a/decoder/pdtest b/decoder/pdtest index e3509b9..5948325 100755 --- a/decoder/pdtest +++ b/decoder/pdtest @@ -24,7 +24,7 @@ import re from getopt import getopt from tempfile import mkstemp from subprocess import Popen, PIPE -from difflib import Differ +from difflib import unified_diff from hashlib import md5 from shutil import copy @@ -236,12 +236,9 @@ def get_tests(testnames): def diff_text(f1, f2): t1 = open(f1).readlines() t2 = open(f2).readlines() - diff = [] - d = Differ() - for line in d.compare(t1, t2): - if line[:2] in ('- ', '+ '): - diff.append(line.strip()) - + diff = list(unified_diff(t1, t2)) + diff = diff[2:] # Strip two from/to filename lines with "+++"/"---". + diff = [d.strip() for d in diff if d[0] in ('+', '-')] return diff