[oe-commits] [openembedded-core] 11/11: oeqa/selftest: Ensure buildtools in environment variables isn't replaced

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 04ee0e8b95cd8ed890374e0007f976684206b630
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Mar 10 13:02:07 2020 +0000

    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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/selftest/context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py
index 409698d..48ec5d4 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -46,7 +46,7 @@ class OESelftestTestContext(OETestContext):
         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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.