diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-07 23:43:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-09 09:48:58 +0100 |
| commit | ee432c5172e359975b5977acb24b7b6b6a3a5011 (patch) | |
| tree | 46bc9636728e8f9457bed5eafa0edf87941631be /meta/lib/oeqa/selftest | |
| parent | ead42232e76db3d19522a9fb92ccc4e7997fe6ee (diff) | |
| download | poky-ee432c5172e359975b5977acb24b7b6b6a3a5011.tar.gz | |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 2 |
1 files changed, 2 insertions, 0 deletions
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): | |||
| 1773 | # Definitions | 1773 | # Definitions |
| 1774 | testrecipe = 'mdadm' | 1774 | testrecipe = 'mdadm' |
| 1775 | testfile = '/sbin/mdadm' | 1775 | testfile = '/sbin/mdadm' |
| 1776 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
| 1777 | testfile = '/usr/sbin/mdadm' | ||
| 1776 | testimage = 'oe-selftest-image' | 1778 | testimage = 'oe-selftest-image' |
| 1777 | testcommand = '/sbin/mdadm --help' | 1779 | testcommand = '/sbin/mdadm --help' |
| 1778 | # Build an image to run | 1780 | # Build an image to run |