mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 06:32:12 +02:00
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: 4dc35667143f19a369bdea9ce2f011a04132509c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit afa211746a2aa1993a54cc5a5e1937679341da8e) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
5568d33e68
commit
91363d054b
@@ -1792,6 +1792,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
|
||||
|
||||
Reference in New Issue
Block a user