From 3b585c5e11b0484df761e67bad736535c2b3423e Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 21 Mar 2025 09:12:40 -0600 Subject: [PATCH] oeqa: spdx: Add tar test for SPDX 2.2 The base-files test for SPDX 2.2 did not give good coverage, since base-files doesn't have any dependencies. Add building tar as another test which more fully exercises the code (From OE-Core rev: d678e25419c89e09c1c438363bf3a940ce903d43) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/spdx.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/spdx.py b/meta/lib/oeqa/selftest/cases/spdx.py index f3b955ed2b..8cd4e83ca2 100644 --- a/meta/lib/oeqa/selftest/cases/spdx.py +++ b/meta/lib/oeqa/selftest/cases/spdx.py @@ -31,13 +31,13 @@ class SPDX22Check(OESelftestTestCase): self.write_config(config) deploy_dir = get_bb_var("DEPLOY_DIR") - machine_var = get_bb_var("MACHINE") + arch_dir = get_bb_var("PACKAGE_ARCH", target_name) spdx_version = get_bb_var("SPDX_VERSION") # qemux86-64 creates the directory qemux86_64 - machine_dir = machine_var.replace("-", "_") + #arch_dir = arch_var.replace("-", "_") full_file_path = os.path.join( - deploy_dir, "spdx", spdx_version, machine_dir, high_level_dir, spdx_file + deploy_dir, "spdx", spdx_version, arch_dir, high_level_dir, spdx_file ) try: @@ -68,6 +68,9 @@ class SPDX22Check(OESelftestTestCase): def test_spdx_base_files(self): self.check_recipe_spdx("packages", "base-files.spdx.json", "base-files") + def test_spdx_tar(self): + self.check_recipe_spdx("packages", "tar.spdx.json", "tar") + class SPDX3CheckBase(object): """