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-16 13:35:09 +0100 |
commit | 32d7c4b179eb615d01afb7298da657008706c6a8 (patch) | |
tree | 0a34e649c05d3d10a85ce78e7e606493b3f8f733 /meta/lib/oeqa/core/utils | |
parent | 2e1f7a335ad42eb1ba2cb896177d7bb40b38bdd4 (diff) | |
download | poky-32d7c4b179eb615d01afb7298da657008706c6a8.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: 611d3947054dad764aeded4c6a050415f7ca4991)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/core/utils')
-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 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): | |||
194 | oe.path.copytree(selftestdir, newselftestdir) | 194 | oe.path.copytree(selftestdir, newselftestdir) |
195 | 195 | ||
196 | for e in os.environ: | 196 | for e in os.environ: |
197 | if builddir in os.environ[e]: | 197 | if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): |
198 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 198 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
199 | 199 | ||
200 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) | 200 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |