oe-selftest's devtool tests have been broken since commit 2457cd57
(oe-selftest: devtool: avoid parallel races by using temporary copy of
core) if meta is a symbolic link.
Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
---
I have tested this change with OE-Core, Poky and our own setup (where
meta is a symbolic link).
meta/lib/oeqa/selftest/cases/devtool.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 3c1189003d..9eb9badf84 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -32,8 +32,9 @@ def setUpModule():
# This helps us match exactly when we're using this path later
canonical_layerpath += '/'
if not edited_layers and canonical_layerpath.endswith('/meta/'):
+ canonical_layerpath = os.path.realpath(canonical_layerpath) + '/'
edited_layers.append(layerpath)
- oldmetapath = layerpath
+ oldmetapath = os.path.realpath(layerpath)
result = runCmd('git rev-parse --show-toplevel',
cwd=canonical_layerpath)
oldreporoot = result.output.rstrip()
newmetapath = os.path.join(corecopydir,
os.path.relpath(oldmetapath, oldreporoot))
--
2.12.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
