yocto-compat-layer.py: make signature check code reusable
This moves the main content of test_signature into a helper function. It can be reused by arbitrary tests that need to do a before/after signature comparison. Long-term this might even be useful in oeqa itself. (From OE-Core rev: 23939d0acb563e27a1419d3f532a47c3d6a59a3e) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
026586965a
commit
bc3fa28e93
|
@ -324,3 +324,69 @@ def get_depgraph(targets=['world'], failsafe=False):
|
||||||
if depgraph is None:
|
if depgraph is None:
|
||||||
raise RuntimeError('Could not retrieve the depgraph.')
|
raise RuntimeError('Could not retrieve the depgraph.')
|
||||||
return depgraph
|
return depgraph
|
||||||
|
|
||||||
|
def compare_signatures(old_sigs, curr_sigs):
|
||||||
|
'''
|
||||||
|
Compares the result of two get_signatures() calls. Returns None if no
|
||||||
|
problems found, otherwise a string that can be used as additional
|
||||||
|
explanation in self.fail().
|
||||||
|
'''
|
||||||
|
# task -> (old signature, new signature)
|
||||||
|
sig_diff = {}
|
||||||
|
for task in old_sigs:
|
||||||
|
if task in curr_sigs and \
|
||||||
|
old_sigs[task] != curr_sigs[task]:
|
||||||
|
sig_diff[task] = (old_sigs[task], curr_sigs[task])
|
||||||
|
|
||||||
|
if not sig_diff:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Beware, depgraph uses task=<pn>.<taskname> whereas get_signatures()
|
||||||
|
# uses <pn>:<taskname>. Need to convert sometimes. The output follows
|
||||||
|
# the convention from get_signatures() because that seems closer to
|
||||||
|
# normal bitbake output.
|
||||||
|
def sig2graph(task):
|
||||||
|
pn, taskname = task.rsplit(':', 1)
|
||||||
|
return pn + '.' + taskname
|
||||||
|
def graph2sig(task):
|
||||||
|
pn, taskname = task.rsplit('.', 1)
|
||||||
|
return pn + ':' + taskname
|
||||||
|
depgraph = get_depgraph(failsafe=True)
|
||||||
|
depends = depgraph['tdepends']
|
||||||
|
|
||||||
|
# If a task A has a changed signature, but none of its
|
||||||
|
# dependencies, then we need to report it because it is
|
||||||
|
# the one which introduces a change. Any task depending on
|
||||||
|
# A (directly or indirectly) will also have a changed
|
||||||
|
# signature, but we don't need to report it. It might have
|
||||||
|
# its own changes, which will become apparent once the
|
||||||
|
# issues that we do report are fixed and the test gets run
|
||||||
|
# again.
|
||||||
|
sig_diff_filtered = []
|
||||||
|
for task, (old_sig, new_sig) in sig_diff.items():
|
||||||
|
deps_tainted = False
|
||||||
|
for dep in depends.get(sig2graph(task), ()):
|
||||||
|
if graph2sig(dep) in sig_diff:
|
||||||
|
deps_tainted = True
|
||||||
|
break
|
||||||
|
if not deps_tainted:
|
||||||
|
sig_diff_filtered.append((task, old_sig, new_sig))
|
||||||
|
|
||||||
|
msg = []
|
||||||
|
msg.append('%d signatures changed, initial differences (first hash before, second after):' %
|
||||||
|
len(sig_diff))
|
||||||
|
for diff in sorted(sig_diff_filtered):
|
||||||
|
recipe, taskname = diff[0].rsplit(':', 1)
|
||||||
|
cmd = 'bitbake-diffsigs --task %s %s --signature %s %s' % \
|
||||||
|
(recipe, taskname, diff[1], diff[2])
|
||||||
|
msg.append(' %s: %s -> %s' % diff)
|
||||||
|
msg.append(' %s' % cmd)
|
||||||
|
try:
|
||||||
|
output = check_command('Determining signature difference failed.',
|
||||||
|
cmd).decode('utf-8')
|
||||||
|
except RuntimeError as error:
|
||||||
|
output = str(error)
|
||||||
|
if output:
|
||||||
|
msg.extend([' ' + line for line in output.splitlines()])
|
||||||
|
msg.append('')
|
||||||
|
return '\n'.join(msg)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
import glob
|
import glob
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
from compatlayer import get_signatures, LayerType, check_command, get_depgraph
|
from compatlayer import get_signatures, LayerType, check_command, get_depgraph, compare_signatures
|
||||||
from compatlayer.case import OECompatLayerTestCase
|
from compatlayer.case import OECompatLayerTestCase
|
||||||
|
|
||||||
class CommonCompatLayer(OECompatLayerTestCase):
|
class CommonCompatLayer(OECompatLayerTestCase):
|
||||||
|
@ -47,61 +47,7 @@ class CommonCompatLayer(OECompatLayerTestCase):
|
||||||
raise unittest.SkipTest("Not testing for signature changes in a software layer %s." \
|
raise unittest.SkipTest("Not testing for signature changes in a software layer %s." \
|
||||||
% self.tc.layer['name'])
|
% self.tc.layer['name'])
|
||||||
|
|
||||||
# task -> (old signature, new signature)
|
|
||||||
sig_diff = {}
|
|
||||||
curr_sigs, _ = get_signatures(self.td['builddir'], failsafe=True)
|
curr_sigs, _ = get_signatures(self.td['builddir'], failsafe=True)
|
||||||
for task in self.td['sigs']:
|
msg = compare_signatures(self.td['sigs'], curr_sigs)
|
||||||
if task in curr_sigs and \
|
if msg is not None:
|
||||||
self.td['sigs'][task] != curr_sigs[task]:
|
self.fail('Adding layer %s changed signatures.\n%s' % (self.tc.layer['name'], msg))
|
||||||
sig_diff[task] = (self.td['sigs'][task], curr_sigs[task])
|
|
||||||
|
|
||||||
if sig_diff:
|
|
||||||
# Beware, depgraph uses task=<pn>.<taskname> whereas get_signatures()
|
|
||||||
# uses <pn>:<taskname>. Need to convert sometimes. The output follows
|
|
||||||
# the convention from get_signatures() because that seems closer to
|
|
||||||
# normal bitbake output.
|
|
||||||
def sig2graph(task):
|
|
||||||
pn, taskname = task.rsplit(':', 1)
|
|
||||||
return pn + '.' + taskname
|
|
||||||
def graph2sig(task):
|
|
||||||
pn, taskname = task.rsplit('.', 1)
|
|
||||||
return pn + ':' + taskname
|
|
||||||
depgraph = get_depgraph(failsafe=True)
|
|
||||||
depends = depgraph['tdepends']
|
|
||||||
|
|
||||||
# If a task A has a changed signature, but none of its
|
|
||||||
# dependencies, then we need to report it because it is
|
|
||||||
# the one which introduces a change. Any task depending on
|
|
||||||
# A (directly or indirectly) will also have a changed
|
|
||||||
# signature, but we don't need to report it. It might have
|
|
||||||
# its own changes, which will become apparent once the
|
|
||||||
# issues that we do report are fixed and the test gets run
|
|
||||||
# again.
|
|
||||||
sig_diff_filtered = []
|
|
||||||
for task, (old_sig, new_sig) in sig_diff.items():
|
|
||||||
deps_tainted = False
|
|
||||||
for dep in depends.get(sig2graph(task), ()):
|
|
||||||
if graph2sig(dep) in sig_diff:
|
|
||||||
deps_tainted = True
|
|
||||||
break
|
|
||||||
if not deps_tainted:
|
|
||||||
sig_diff_filtered.append((task, old_sig, new_sig))
|
|
||||||
|
|
||||||
msg = []
|
|
||||||
msg.append('Layer %s changed %d signatures, initial differences (first hash without, second with layer):' %
|
|
||||||
(self.tc.layer['name'], len(sig_diff)))
|
|
||||||
for diff in sorted(sig_diff_filtered):
|
|
||||||
recipe, taskname = diff[0].rsplit(':', 1)
|
|
||||||
cmd = 'bitbake-diffsigs --task %s %s --signature %s %s' % \
|
|
||||||
(recipe, taskname, diff[1], diff[2])
|
|
||||||
msg.append(' %s: %s -> %s' % diff)
|
|
||||||
msg.append(' %s' % cmd)
|
|
||||||
try:
|
|
||||||
output = check_command('Determining signature difference failed.',
|
|
||||||
cmd).decode('utf-8')
|
|
||||||
except RuntimeError as error:
|
|
||||||
output = str(error)
|
|
||||||
if output:
|
|
||||||
msg.extend([' ' + line for line in output.splitlines()])
|
|
||||||
msg.append('')
|
|
||||||
self.fail('\n'.join(msg))
|
|
||||||
|
|
Loading…
Reference in New Issue