From: Peter Kjellerstedt Date: Sat, 20 Oct 2018 23:20:59 +0000 (+0200) Subject: oe-selftest: devtool: Support meta being a symbolic link X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3eb59559ecd2e93fb590a330b47de1db0750fc0b;p=openembedded-core.git 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 Signed-off-by: Armin Kuster --- diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 3d77497fc4..0ce90a4af9 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))