From 8e4c03744cfa8cc559682ebf7074643216dd2b9d Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sun, 21 Oct 2018 01:20:59 +0200 Subject: oe-selftest: devtool: Support meta being a symbolic link 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. (From OE-Core rev: daba6c5a991b370709d17e51305334f55a3858ec) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- 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)) -- cgit v1.2.3-54-g00ecf