@@ -891,13 +891,24 @@ INHERIT += "base-do-configure-modified"
expected_sametmp_output, expected_difftmp_output)
class SStateCheckObjectPresence(SStateBase):
- def check_bb_output(self, output, exceptions, check_cdn):
+ def check_bb_output(self, output, targets, exceptions, check_cdn):
def is_exception(object, exceptions):
for e in exceptions:
if re.search(e, object):
return True
return False
+ # sstate is checked for existence of these, but they never get written out to begin with
+ exceptions += ["{}.*image_qa".format(t) for t in targets.split()]
+ exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()]
+ exceptions += ["{}.*image_complete".format(t) for t in targets.split()]
+ exceptions += ["linux-yocto.*shared_workdir"]
+ # these get influnced by IMAGE_FSTYPES tweaks in yocto-autobuilder-helper's config.json (on x86-64)
+ # additionally, they depend on noexec (thus, absent stamps) package, install, etc. image tasks,
+ # which makes tracing other changes difficult
+ exceptions += ["{}.*create_spdx".format(t) for t in targets.split()]
+ exceptions += ["{}.*create_runtime_spdx".format(t) for t in targets.split()]
+
output_l = output.splitlines()
for l in output_l:
if l.startswith("Sstate summary"):
@@ -935,17 +946,6 @@ class SStateCheckObjectPresence(SStateBase):
@OETestTag("yocto-mirrors")
class SStateMirrors(SStateCheckObjectPresence):
def run_test(self, machine, targets, exceptions, check_cdn = True):
- # sstate is checked for existence of these, but they never get written out to begin with
- exceptions += ["{}.*image_qa".format(t) for t in targets.split()]
- exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()]
- exceptions += ["{}.*image_complete".format(t) for t in targets.split()]
- exceptions += ["linux-yocto.*shared_workdir"]
- # these get influnced by IMAGE_FSTYPES tweaks in yocto-autobuilder-helper's config.json (on x86-64)
- # additionally, they depend on noexec (thus, absent stamps) package, install, etc. image tasks,
- # which makes tracing other changes difficult
- exceptions += ["{}.*create_spdx".format(t) for t in targets.split()]
- exceptions += ["{}.*create_runtime_spdx".format(t) for t in targets.split()]
-
if check_cdn:
self.config_sstate(True)
self.append_config("""
@@ -959,7 +959,7 @@ MACHINE = "{}"
""".format(machine))
result = bitbake("-DD -n {}".format(targets))
bitbake("-S none {}".format(targets))
- self.check_bb_output(result.output, exceptions, check_cdn)
+ self.check_bb_output(result.output, targets, exceptions, check_cdn)
def test_cdn_mirror_qemux86_64(self):
exceptions = []
This is useful not just in cdn/local cache tests, but also in the build bundle test, and so should be applied by default. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/lib/oeqa/selftest/cases/sstatetests.py | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-)