Sfoglia il codice sorgente

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>
Peter Kjellerstedt 6 anni fa
parent
commit
8e4c03744c
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      meta/lib/oeqa/selftest/cases/devtool.py

+ 2 - 1
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))