summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-10 13:02:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-08 10:06:57 +0100
commitcf51a1e4447010f927a9e3f4ff5a5c305be0c0c9 (patch)
tree2fd8698243a19db87c1495b9b0685172181d7e03
parentaad4b41c49b1a63a767150a3451e10d15e8bcf31 (diff)
downloadopenembedded-core-cf51a1e4447010f927a9e3f4ff5a5c305be0c0c9.tar.gz
openembedded-core-cf51a1e4447010f927a9e3f4ff5a5c305be0c0c9.tar.bz2
openembedded-core-cf51a1e4447010f927a9e3f4ff5a5c305be0c0c9.zip
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: b51a8c390714357713e91d828708c85cf5f68971) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/core/utils/concurrencytest.py2
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 6bf7718863..5f10267f70 100644
--- a/meta/lib/oeqa/core/utils/concurrencytest.py
+++ b/meta/lib/oeqa/core/utils/concurrencytest.py
@@ -199,7 +199,7 @@ def fork_for_tests(concurrency_num, suite):
oe.path.copytree(selftestdir, newselftestdir)
for e in os.environ:
- if builddir in os.environ[e]:
+ if builddir + "/" in os.environ[e] or 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)