From d97b2bdb0b468903a61041e163f203577b88986e Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Mon, 7 Aug 2017 14:33:50 -0700 Subject: sstatetests: Use python function instead of bitbake-diffsigs script Using a python function instead of launching a subprocess fasten the diffsigs computation. [YOCTO #11651] (From OE-Core rev: 5dd65cf50273519fa45bd056b9ff342d9984a382) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/sstatetests.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/lib/oeqa/selftest/cases/sstatetests.py') diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 07a206824a..0b36027918 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -8,6 +8,8 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer from oeqa.selftest.cases.sstate import SStateBase from oeqa.core.decorator.oeid import OETestID +import bb.siggen + class SStateTests(SStateBase): # Test sstate files creation and their location @@ -469,9 +471,11 @@ http_proxy = "http://example.com/" for k in files1.keys() | files2.keys(): if k in files1 and k in files2: print("%s differs:" % k) - print(subprocess.check_output(("bitbake-diffsigs", - self.topdir + "/tmp-sstatesamehash/stamps/" + k + "." + files1[k], - self.topdir + "/tmp-sstatesamehash2/stamps/" + k + "." + files2[k]))) + sigdatafile1 = self.topdir + "/tmp-sstatesamehash/stamps/" + k + "." + files1[k] + sigdatafile2 = self.topdir + "/tmp-sstatesamehash2/stamps/" + k + "." + files2[k] + output = bb.siggen.compare_sigfiles(sigdatafile1, sigdatafile2) + if output: + print('\n'.join(output)) elif k in files1 and k not in files2: print("%s in files1" % k) elif k not in files1 and k in files2: -- cgit v1.2.3-54-g00ecf