diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-10-21 01:20:59 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-21 21:30:30 +0100 |
| commit | daba6c5a991b370709d17e51305334f55a3858ec (patch) | |
| tree | d5615f4b1661416e05c70f488102da0a495c572d | |
| parent | d48c8148eae41e613448d78c26516538244cd9c9 (diff) | |
| download | openembedded-core-daba6c5a991b370709d17e51305334f55a3858ec.tar.gz openembedded-core-daba6c5a991b370709d17e51305334f55a3858ec.tar.bz2 openembedded-core-daba6c5a991b370709d17e51305334f55a3858ec.zip | |
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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 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)) |