X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fpdtest;fp=tests%2Fpdtest;h=e88317a3431c2dbb58794d6883e9960e143da311;hb=b7e15e0e2c1fef3a938c84d79022098f8482920a;hp=2a90f2c2e965f4e84d0b5037dccbad2b7be559b0;hpb=3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a;p=libsigrokdecode.git diff --git a/tests/pdtest b/tests/pdtest index 2a90f2c..e88317a 100755 --- a/tests/pdtest +++ b/tests/pdtest @@ -205,7 +205,7 @@ def get_tests(testnames): return tests -def diff_textfiles(f1, f2): +def diff_text(f1, f2): t1 = open(f1).readlines() t2 = open(f2).readlines() diff = [] @@ -217,7 +217,7 @@ def diff_textfiles(f1, f2): return diff -def compare_binfiles(f1, f2): +def compare_binary(f1, f2): h1 = md5() h1.update(open(f1, 'rb').read()) h2 = md5() @@ -278,10 +278,10 @@ def run_tests(tests, fix=False): match = os.path.join(decoders_dir, op['pd'], 'test', op['match']) try: diff = diff_error = None - if op['type'] == 'annotation': - diff = diff_textfiles(match, outfile) + if op['type'] in ('annotation', 'python'): + diff = diff_text(match, outfile) elif op['type'] == 'binary': - diff = compare_binfiles(match, outfile) + diff = compare_binary(match, outfile) else: diff = ["Unsupported output type '%s'." % op['type']] except Exception as e: