[oe-commits] [openembedded-core] 01/12: oeqa/testsdk: Use original PATH

[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 87c9602fd0dedc7bcf75b822aaf5f6ebfc17737c
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sun Mar 8 10:20:12 2020 +0000

    oeqa/testsdk: Use original PATH
    
    We want to test the SDK with PATH from the original host, not with our own
    tools injected via HOSTTOOLS. It even uses some tools which aren't in
    HOSTTOOLS.
    
    This is necessary after changing the SDK to not reset PATH to the system
    default which is bad for other reasons and brings the testing into sync
    with that change.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/sdkext/testsdk.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py
index 785b5dd..c5c46df 100644
--- a/meta/lib/oeqa/sdkext/testsdk.py
+++ b/meta/lib/oeqa/sdkext/testsdk.py
@@ -25,11 +25,8 @@ class TestSDKExt(TestSDKBase):
 
         subprocesstweak.errors_have_output()
 
-        # extensible sdk can be contaminated if native programs are
-        # in PATH, i.e. use perl-native instead of eSDK one.
-        paths_to_avoid = [d.getVar('STAGING_DIR'),
-                        d.getVar('BASE_WORKDIR')]
-        os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
+        # We need the original PATH for testing the eSDK, not with our manipulations
+        os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH")
 
         tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh")
         if not os.path.exists(tcname):

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