From ee432c5172e359975b5977acb24b7b6b6a3a5011 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 May 2024 23:43:41 +0100 Subject: [PATCH] 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. (From OE-Core rev: afa211746a2aa1993a54cc5a5e1937679341da8e) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/devtool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index c8f9534e41..882225dde3 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