aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest/cases
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-08-07 14:33:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-08 12:53:02 +0100
commit5dd65cf50273519fa45bd056b9ff342d9984a382 (patch)
tree97d308a51b0194eb866e7f20c1492ac225fb2af3 /meta/lib/oeqa/selftest/cases
parent5cc53ea9347035f96a721ab057a338eded5c5c67 (diff)
downloadopenembedded-core-contrib-5dd65cf50273519fa45bd056b9ff342d9984a382.tar.gz
sstatetests: Use python function instead of bitbake-diffsigs script
Using a python function instead of launching a subprocess fasten the diffsigs computation. [YOCTO #11651] Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases')
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py10
1 files changed, 7 insertions, 3 deletions
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: