From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 7 May 2024 22:43:41 +0000 (+0100)
Subject: oeqa/selftest/devtool: Fix for usrmerge in DISTRO_FEATURES
X-Git-Tag: uninative-4.5~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa211746a2aa1993a54cc5a5e1937679341da8e;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

oeqa/selftest/devtool: Fix for usrmerge in DISTRO_FEATURES

If usrmerge is in DISTRO_FEATURES, assumptions in one of the tests would
fail. Improve the test so it works in both cases.

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

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index c8f9534e416..882225dde34 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1773,6 +1773,8 @@ class DevtoolExtractTests(DevtoolBase):
         # Definitions
         testrecipe = 'mdadm'
         testfile = '/sbin/mdadm'
+        if "usrmerge" in get_bb_var('DISTRO_FEATURES'):
+            testfile = '/usr/sbin/mdadm'
         testimage = 'oe-selftest-image'
         testcommand = '/sbin/mdadm --help'
         # Build an image to run