diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-08 09:59:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 12:51:24 +0100 |
commit | dc0673760d019c42491b16ba519e0089aa3a64cf (patch) | |
tree | 7755f282de46d77dd1f5ec1e897c670bb87dba6b /meta | |
parent | a4ced5e15755113f7d229090ab4b40061bdfe17e (diff) | |
download | poky-dc0673760d019c42491b16ba519e0089aa3a64cf.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.
(From OE-Core rev: b90c8e041a9a2daa9472ed37630d8e0fdec18d36)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 889005dc17d3e3b8eadee907ee2c05b8ff613285)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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): | |||
82 | oe.path.copytree(selftestdir, newselftestdir) | 82 | oe.path.copytree(selftestdir, newselftestdir) |
83 | 83 | ||
84 | for e in os.environ: | 84 | for e in os.environ: |
85 | if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): | 85 | if builddir + "/" in os.environ[e]: |
86 | os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") | ||
87 | if os.environ[e].endswith(builddir): | ||
86 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 88 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
87 | 89 | ||
88 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) | 90 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |