summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-08 23:17:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-19 11:11:58 +0000
commit04399541c4301c66401be594f7939d76db5832e4 (patch)
tree5c04efcdc494e6207adcbe7a31ab3e02c9f7ea73 /meta
parent48f3094c2496f1b79ad62504708dbf86218c03db (diff)
downloadpoky-04399541c4301c66401be594f7939d76db5832e4.tar.gz
oeqa/sstate: Fix allarch samesigs test
The allarch sstate sigs test is supposed to compare the allarch sigs but does not. Fix this. Also rename the common function to make it clear it isn't just used by the allarch test. (From OE-Core rev: 93a2c497368b56c912d6c9b06f18551cc8c6ddc8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 549597d422c7bcb467f34139ff25d2bee96bf851) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 7e0ed0dac1..4b8669e9d3 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -347,7 +347,7 @@ TCLIBCAPPEND = \"\"
347MACHINE = \"qemuarm\" 347MACHINE = \"qemuarm\"
348BB_SIGNATURE_HANDLER = "OEBasicHash" 348BB_SIGNATURE_HANDLER = "OEBasicHash"
349""" 349"""
350 self.sstate_allarch_samesigs(configA, configB) 350 self.sstate_common_samesigs(configA, configB, allarch=True)
351 351
352 def test_sstate_nativesdk_samesigs_multilib(self): 352 def test_sstate_nativesdk_samesigs_multilib(self):
353 """ 353 """
@@ -371,9 +371,9 @@ require conf/multilib.conf
371MULTILIBS = \"\" 371MULTILIBS = \"\"
372BB_SIGNATURE_HANDLER = "OEBasicHash" 372BB_SIGNATURE_HANDLER = "OEBasicHash"
373""" 373"""
374 self.sstate_allarch_samesigs(configA, configB) 374 self.sstate_common_samesigs(configA, configB)
375 375
376 def sstate_allarch_samesigs(self, configA, configB): 376 def sstate_common_samesigs(self, configA, configB, allarch=False):
377 377
378 self.write_config(configA) 378 self.write_config(configA)
379 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") 379 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash")
@@ -401,6 +401,13 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
401 self.maxDiff = None 401 self.maxDiff = None
402 self.assertEqual(files1, files2) 402 self.assertEqual(files1, files2)
403 403
404 if allarch:
405 allarchdir = os.path.basename(glob.glob(self.topdir + "/tmp-sstatesamehash/stamps/all-*-linux")[0])
406
407 files1 = get_files(self.topdir + "/tmp-sstatesamehash/stamps/" + allarchdir)
408 files2 = get_files(self.topdir + "/tmp-sstatesamehash2/stamps/" + allarchdir)
409 self.assertEqual(files1, files2)
410
404 def test_sstate_sametune_samesigs(self): 411 def test_sstate_sametune_samesigs(self):
405 """ 412 """
406 The sstate checksums of two identical machines (using the same tune) should be the 413 The sstate checksums of two identical machines (using the same tune) should be the