From: Richard Purdie Date: Tue, 8 Sep 2020 08:59:54 +0000 (+0100) Subject: oeqa/concurrencytest: Improve builddir path manipulations X-Git-Tag: 2020-04.3-dunfell~20 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b90c8e041a9a2daa9472ed37630d8e0fdec18d36;p=openembedded-core.git 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 (cherry picked from commit 889005dc17d3e3b8eadee907ee2c05b8ff613285) Signed-off-by: Steve Sakoman --- 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)