oe-selftest: devtool: Support meta being a symbolic link

PATCH New Peter Kjellerstedt 1 participant 1 message Oct 20, 2018

Share & tools

Peter Kjellerstedt

author

2018-10-20 23:21 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

I have tested this change with OE-Core, Poky and our own setup (where meta is a symbolic link).

 meta/lib/oeqa/selftest/cases/devtool.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/lib/oeqa/selftest/cases/devtool.py +2 -1

index 3c1189003d..9eb9badf84 100644
@@ -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))

Signature · 1 line

2.12.0