diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-08 09:59:54 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2020-09-14 04:26:37 -1000 |
commit | b90c8e041a9a2daa9472ed37630d8e0fdec18d36 (patch) | |
tree | db9c89892dc4b1d4bf55c1a8353796ce91ceed1d | |
parent | 3be3740d0239f2eb198ccd2b75597cdccbdd1efc (diff) | |
download | openembedded-core-contrib-b90c8e041a9a2daa9472ed37630d8e0fdec18d36.tar.gz |
oeqa/concurrencytest: Improve builddir path manipulations
Its possible some patterns may cause problems with the current path
manipulations, make a small tweak to try and avoid potential pathname
overlap issues.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 889005dc17d3e3b8eadee907ee2c05b8ff613285)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/lib/oeqa/selftest/context.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 9baad58321..33557b1240 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -82,7 +82,9 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(selftestdir, newselftestdir) for e in os.environ: - if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): + if builddir + "/" in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") + if os.environ[e].endswith(builddir): os.environ[e] = os.environ[e].replace(builddir, newbuilddir) subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |