@@ -107,18 +107,11 @@ class WicTestCase(OESelftestTestCase):
def _get_wic_path(self):
if WicTestCase.wic_bindir is None:
- search_paths = [
- os.path.join(self.td['COREBASE'], 'scripts'),
- os.path.join(get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools'), 'usr', 'bin'),
- ]
-
- for bindir in search_paths:
- if os.path.exists(os.path.join(bindir, 'wic')):
- WicTestCase.wic_bindir = bindir
- break
-
- if WicTestCase.wic_bindir is None:
- self.fail("Unable to find the wic binary in %s" % ', '.join(search_paths))
+ bindir = os.path.join(get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools'),
+ 'usr', 'bin')
+ if not os.path.exists(os.path.join(bindir, 'wic')):
+ self.fail("Unable to find the wic binary in %s" % bindir)
+ WicTestCase.wic_bindir = bindir
path_entries = []
for path_group in (
_get_wic_path() searches for the wic binary in two locations: the in-tree scripts directory and the wic-tools native sysroot. wic was moved to a standalone repository and is no longer shipped in scripts/, so scripts/wic never exists and the first search path can never match. Look for wic only in the wic-tools native sysroot, where the wic recipe installs it, and fail with that path if it is missing. AI-Generated: codex/claude-opus 4.8 (xhigh) Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- changes in v4: - new in v4 --- meta/lib/oeqa/selftest/cases/wic.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)