From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 12 Jun 2024 06:53:56 +0000 (+0100)
Subject: selftest/spdx: Fix for SPDX_VERSION addition
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055e8c21908127722abad9e992d6408d8697a119;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

selftest/spdx: Fix for SPDX_VERSION addition

Update the test for the addition of SPDX_VERSION to the deploy path.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/selftest/cases/spdx.py b/meta/lib/oeqa/selftest/cases/spdx.py
index 05fc4e390b2..7685a81e7fb 100644
--- a/meta/lib/oeqa/selftest/cases/spdx.py
+++ b/meta/lib/oeqa/selftest/cases/spdx.py
@@ -25,10 +25,11 @@ INHERIT += "create-spdx"
 
         deploy_dir = get_bb_var("DEPLOY_DIR")
         machine_var = get_bb_var("MACHINE")
+        spdx_version = get_bb_var("SPDX_VERSION")
         # qemux86-64 creates the directory qemux86_64
         machine_dir = machine_var.replace("-", "_")
 
-        full_file_path = os.path.join(deploy_dir, "spdx", machine_dir, high_level_dir, spdx_file)
+        full_file_path = os.path.join(deploy_dir, "spdx", spdx_version, machine_dir, high_level_dir, spdx_file)
 
         try:
             os.remove(full_file_path)