diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/testsdk.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r-- | meta/classes/testsdk.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 06b4c5034f..063b9080a5 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass | |||
@@ -54,8 +54,8 @@ def testsdk_main(d): | |||
54 | import subprocess | 54 | import subprocess |
55 | from oeqa.oetest import SDKTestContext | 55 | from oeqa.oetest import SDKTestContext |
56 | 56 | ||
57 | pn = d.getVar("PN", True) | 57 | pn = d.getVar("PN") |
58 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True)) | 58 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) |
59 | 59 | ||
60 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") | 60 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") |
61 | if not os.path.exists(tcname): | 61 | if not os.path.exists(tcname): |
@@ -100,12 +100,12 @@ def testsdkext_main(d): | |||
100 | 100 | ||
101 | # extensible sdk can be contaminated if native programs are | 101 | # extensible sdk can be contaminated if native programs are |
102 | # in PATH, i.e. use perl-native instead of eSDK one. | 102 | # in PATH, i.e. use perl-native instead of eSDK one. |
103 | paths_to_avoid = [d.getVar('STAGING_DIR', True), | 103 | paths_to_avoid = [d.getVar('STAGING_DIR'), |
104 | d.getVar('BASE_WORKDIR', True)] | 104 | d.getVar('BASE_WORKDIR')] |
105 | os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) | 105 | os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) |
106 | 106 | ||
107 | pn = d.getVar("PN", True) | 107 | pn = d.getVar("PN") |
108 | bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR", True)) | 108 | bb.utils.mkdirhier(d.getVar("TEST_LOG_SDKEXT_DIR")) |
109 | 109 | ||
110 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") | 110 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") |
111 | if not os.path.exists(tcname): | 111 | if not os.path.exists(tcname): |