summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-10 13:02:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-08 09:20:21 (GMT)
commitb38544561a9341c018bce2a95f82cc472ce956d8 (patch)
tree141c3314d0893b7a67a36ff4a2b6ef9aa600122a
parent35068e2c739679a5f7784a2935b80ce8f2464092 (diff)
downloadpoky-b38544561a9341c018bce2a95f82cc472ce956d8.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: b51a8c390714357713e91d828708c85cf5f68971) (From OE-Core rev: cf51a1e4447010f927a9e3f4ff5a5c305be0c0c9) 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 6bf7718..5f10267 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):
199 oe.path.copytree(selftestdir, newselftestdir) 199 oe.path.copytree(selftestdir, newselftestdir)
200 200
201 for e in os.environ: 201 for e in os.environ:
202 if builddir in os.environ[e]: 202 if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir):
203 os.environ[e] = os.environ[e].replace(builddir, newbuilddir) 203 os.environ[e] = os.environ[e].replace(builddir, newbuilddir)
204 204
205 subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) 205 subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True)