[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7075/8267] sstatetests: Use python function instead of bitbake-diffsigs script
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7075/8267] sstatetests: Use python function instead of bitbake-diffsigs script
- Date: Sun, 17 Dec 2017 05:44:20 +0000 (UTC)
commit d97b2bdb0b468903a61041e163f203577b88986e
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date: Mon Aug 7 14:33:50 2017 -0700
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 <leonardo sandoval gonzalez linux intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oeqa/selftest/cases/sstatetests.py | 10 +++++++---
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 07a2068..0b36027 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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]