diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-07 23:43:41 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-07-09 06:02:56 -0700 |
| commit | 91363d054b496f95076ba9e20eae0d5f6fe640ca (patch) | |
| tree | c6b14501c29770219ebd94df39ab4706271b54be /meta/lib | |
| parent | 5568d33e6879666be7c796225f8cb934ff04681d (diff) | |
| download | poky-91363d054b496f95076ba9e20eae0d5f6fe640ca.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: 4dc35667143f19a369bdea9ce2f011a04132509c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit afa211746a2aa1993a54cc5a5e1937679341da8e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib')
| -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 44a2a50f2e..fc08906117 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -1792,6 +1792,8 @@ class DevtoolExtractTests(DevtoolBase): | |||
| 1792 | # Definitions | 1792 | # Definitions |
| 1793 | testrecipe = 'mdadm' | 1793 | testrecipe = 'mdadm' |
| 1794 | testfile = '/sbin/mdadm' | 1794 | testfile = '/sbin/mdadm' |
| 1795 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
| 1796 | testfile = '/usr/sbin/mdadm' | ||
| 1795 | testimage = 'oe-selftest-image' | 1797 | testimage = 'oe-selftest-image' |
| 1796 | testcommand = '/sbin/mdadm --help' | 1798 | testcommand = '/sbin/mdadm --help' |
| 1797 | # Build an image to run | 1799 | # Build an image to run |