From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 17 Jul 2024 13:34:57 +0000 (+0100)
Subject: testimage: Fix TESTIMAGE_FAILED_QA_ARTIFACTS setting
X-Git-Tag: uninative-4.6~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7af85a7b7b966685a9eeaba11628dc10c1ea44b;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

testimage: Fix TESTIMAGE_FAILED_QA_ARTIFACTS setting

MCNAME isn't defined outside our mcextend ptest images so use a wildcard in
TESTIMAGE_FAILED_QA_ARTIFACTS instead. This unbreaks the value in other images.

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

diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass
index 72282ac3624..531330f3848 100644
--- a/meta/classes-recipe/testimage.bbclass
+++ b/meta/classes-recipe/testimage.bbclass
@@ -28,7 +28,7 @@ TESTIMAGE_FAILED_QA_ARTIFACTS = "\
     ${sysconfdir}/os-release"
 
 # If some ptests are run and fail, retrieve corresponding directories
-TESTIMAGE_FAILED_QA_ARTIFACTS += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${libdir}/${MCNAME}/ptest', '', d)}"
+TESTIMAGE_FAILED_QA_ARTIFACTS += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${libdir}/*/ptest', '', d)}"
 
 # You can set (or append to) TEST_SUITES in local.conf to select the tests
 # which you want to run for your target.