aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-10 13:02:07 +0000
committerJeremy A. Puhlman <jpuhlman@mvista.com>2020-07-16 09:01:02 -0700
commit2f190206110bf3c100a0e21ded2524e2ad1b7398 (patch)
treea72a74defcf660b8dc95800493d22be8eab7d7cf
parentda7a22ebcebf479a8999e6f23756657db0a2ee5e (diff)
downloadopenembedded-core-contrib-2f190206110bf3c100a0e21ded2524e2ad1b7398.tar.gz
openembedded-core-contrib-2f190206110bf3c100a0e21ded2524e2ad1b7398.tar.bz2
openembedded-core-contrib-2f190206110bf3c100a0e21ded2524e2ad1b7398.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. (Cherry-picked from f930e2cadb9ee69759720b6c49aeeb6dd43a7edd but adjusted for thud) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
-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 1a58d35ba0a..3e0e5d770c8 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)