summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-08 10:20:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-16 12:35:09 (GMT)
commit24f57d0379211f30d58beeb094b68a51c651fb38 (patch)
tree88868c060d931443e81d6c8d314571204c139730
parent32d7c4b179eb615d01afb7298da657008706c6a8 (diff)
downloadpoky-24f57d0379211f30d58beeb094b68a51c651fb38.tar.gz
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. (From OE-Core rev: 87c9602fd0dedc7bcf75b822aaf5f6ebfc17737c) (From OE-Core rev: 2cb99a44c650db7fd6fbd269f5788e4ebfd523fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdkext/testsdk.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py
index 57b2e0e..8ec5262 100644
--- a/meta/lib/oeqa/sdkext/testsdk.py
+++ b/meta/lib/oeqa/sdkext/testsdk.py
@@ -22,11 +22,8 @@ class TestSDKExt(TestSDKBase):
22 22
23 subprocesstweak.errors_have_output() 23 subprocesstweak.errors_have_output()
24 24
25 # extensible sdk can be contaminated if native programs are 25 # We need the original PATH for testing the eSDK, not with our manipulations
26 # in PATH, i.e. use perl-native instead of eSDK one. 26 os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH")
27 paths_to_avoid = [d.getVar('STAGING_DIR'),
28 d.getVar('BASE_WORKDIR')]
29 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
30 27
31 tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") 28 tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh")
32 if not os.path.exists(tcname): 29 if not os.path.exists(tcname):