diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-10 13:02:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-10 13:21:41 +0100 |
commit | 25ac7e58c8d35a7b328d27c1582675276b40cf73 (patch) | |
tree | 90c62b9441f54f97fe8a9809e31b6ae282a22c89 /meta/lib/oeqa | |
parent | 8b269b3a2b6fb4b50533740d86e0371cae905227 (diff) | |
download | poky-25ac7e58c8d35a7b328d27c1582675276b40cf73.tar.gz |
oeqa/selftest: Ensure buildtools in environment variables isn't replaced
This avoids the seeing broken replacements like:
oe-selftest-centos/build/build-st-926tools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt
which understandably break builds.
(From OE-Core rev: 04ee0e8b95cd8ed890374e0007f976684206b630)
(Cherry-picked from f930e2cadb9ee69759720b6c49aeeb6dd43a7edd but adjusted for thud)
(From OE-Core rev: 3841b0e2a2e1c1ebd296c6057831b3e463fcba69)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/core/utils/concurrencytest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0f7b3dcc11..e6b14da89d 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py | |||
@@ -261,7 +261,7 @@ def fork_for_tests(concurrency_num, suite): | |||
261 | oe.path.copytree(selftestdir, newselftestdir) | 261 | oe.path.copytree(selftestdir, newselftestdir) |
262 | 262 | ||
263 | for e in os.environ: | 263 | for e in os.environ: |
264 | if builddir in os.environ[e]: | 264 | if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): |
265 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 265 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
266 | 266 | ||
267 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) | 267 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |