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/testimage.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/testimage.bbclass')
-rw-r--r-- | meta/classes/testimage.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 6b6781d860..770ec801c2 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -130,8 +130,8 @@ def testimage_main(d): | |||
130 | from oeqa.targetcontrol import get_target_controller | 130 | from oeqa.targetcontrol import get_target_controller |
131 | from oeqa.utils.dump import get_host_dumper | 131 | from oeqa.utils.dump import get_host_dumper |
132 | 132 | ||
133 | pn = d.getVar("PN", True) | 133 | pn = d.getVar("PN") |
134 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True)) | 134 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) |
135 | test_create_extract_dirs(d) | 135 | test_create_extract_dirs(d) |
136 | 136 | ||
137 | # we need the host dumper in test context | 137 | # we need the host dumper in test context |
@@ -176,10 +176,10 @@ def testimage_main(d): | |||
176 | target.stop() | 176 | target.stop() |
177 | 177 | ||
178 | def test_create_extract_dirs(d): | 178 | def test_create_extract_dirs(d): |
179 | install_path = d.getVar("TEST_INSTALL_TMP_DIR", True) | 179 | install_path = d.getVar("TEST_INSTALL_TMP_DIR") |
180 | package_path = d.getVar("TEST_PACKAGED_DIR", True) | 180 | package_path = d.getVar("TEST_PACKAGED_DIR") |
181 | extracted_path = d.getVar("TEST_EXTRACTED_DIR", True) | 181 | extracted_path = d.getVar("TEST_EXTRACTED_DIR") |
182 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True)) | 182 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) |
183 | bb.utils.remove(package_path, recurse=True) | 183 | bb.utils.remove(package_path, recurse=True) |
184 | bb.utils.mkdirhier(install_path) | 184 | bb.utils.mkdirhier(install_path) |
185 | bb.utils.mkdirhier(package_path) | 185 | bb.utils.mkdirhier(package_path) |