From 35de7080c53808ade526b3b97cb54f528357deca Mon Sep 17 00:00:00 2001 From: Chris Laplante Date: Wed, 29 Jan 2025 15:20:16 -0500 Subject: [PATCH] oeqa/selftest: also copy local changes from the 'scripts/' dir The 'devtool' cases make a copy of 'poky', but before this patch, that only included modifications to the 'meta/' subdirectory. It's very frustrating to make changes to scripts/ and have them be silently ignored by oe-selftest. Signed-off-by: Chris Laplante Signed-off-by: Mathieu Dubois-Briand --- meta/lib/oeqa/selftest/cases/devtool.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index fb9d7966eda..e09e9755a3b 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -64,11 +64,15 @@ def setUpModule(): # under COREBASE and we don't want to copy that, so we have # to be selective. result = runCmd('git status --porcelain', cwd=oldreporoot) + + # Also copy modifications to the 'scripts/' directory + canonical_layerpath_scripts = os.path.normpath(canonical_layerpath + "../scripts") + for line in result.output.splitlines(): if line.startswith(' M ') or line.startswith('?? '): relpth = line.split()[1] pth = os.path.join(oldreporoot, relpth) - if pth.startswith(canonical_layerpath): + if pth.startswith(canonical_layerpath) or pth.startswith(canonical_layerpath_scripts): if relpth.endswith('/'): destdir = os.path.join(corecopydir, relpth) # avoid race condition by not copying .pyc files YPBZ#13421,13803 -- 2.47.3