diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-10-21 01:20:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:13:07 +0000 |
commit | 3eb59559ecd2e93fb590a330b47de1db0750fc0b (patch) | |
tree | 3c3e7c4c5390c46d645953baaea47ffbaddb7f9d /meta/lib/oeqa/selftest | |
parent | 9cb8353a4f0137823d6ed3e467db9dd7ead7b3de (diff) | |
download | openembedded-core-contrib-3eb59559ecd2e93fb590a330b47de1db0750fc0b.tar.gz |
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 <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |