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 14:38:53 +0100
commit611d3947054dad764aeded4c6a050415f7ca4991 (patch)
treee93cdaa4bee7e8388c173eb2b96d9dbe5b79dd63
parent0e12f41848fd2fdbc0f70f568ce13baeb3263d03 (diff)
downloadopenembedded-core-contrib-611d3947054dad764aeded4c6a050415f7ca4991.tar.gz
openembedded-core-contrib-611d3947054dad764aeded4c6a050415f7ca4991.tar.bz2
openembedded-core-contrib-611d3947054dad764aeded4c6a050415f7ca4991.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) 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 1a58d35ba0..3e0e5d770c 100644
--- a/meta/lib/oeqa/core/utils/concurrencytest.py
+++ b/meta/lib/oeqa/core/utils/concurrencytest.py
@@ -194,7 +194,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)