summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-10-20 23:20:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-21 20:30:35 (GMT)
commit8e4c03744cfa8cc559682ebf7074643216dd2b9d (patch)
treebf31e6a9e4f62742d7f217cc523e00a8b85fbf8b
parent83eece2535746e186341fb01e72c19595d5c6392 (diff)
downloadpoky-uninative-2.3.tar.gz
oe-selftest: devtool: Support meta being a symbolic linkuninative-2.3
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>
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py3
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 3c11890..9eb9bad 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -32,8 +32,9 @@ def setUpModule():
32 # This helps us match exactly when we're using this path later 32 # This helps us match exactly when we're using this path later
33 canonical_layerpath += '/' 33 canonical_layerpath += '/'
34 if not edited_layers and canonical_layerpath.endswith('/meta/'): 34 if not edited_layers and canonical_layerpath.endswith('/meta/'):
35 canonical_layerpath = os.path.realpath(canonical_layerpath) + '/'
35 edited_layers.append(layerpath) 36 edited_layers.append(layerpath)
36 oldmetapath = layerpath 37 oldmetapath = os.path.realpath(layerpath)
37 result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) 38 result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath)
38 oldreporoot = result.output.rstrip() 39 oldreporoot = result.output.rstrip()
39 newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) 40 newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot))