diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-03-01 12:21:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:11 +0000 |
| commit | 88c1fb2f0c52a05e7314b8790e6f72c66c4de5ef (patch) | |
| tree | af744b7f90b2c22e9fbdf45efbc15b1aba781fb1 /meta/classes | |
| parent | 726832895de0e8d98fea8dde422e46b249a7bcc9 (diff) | |
| download | poky-88c1fb2f0c52a05e7314b8790e6f72c66c4de5ef.tar.gz | |
oeqa/sdkext/devtool: use finally instead of repeating cleanup
Use the finally: block to always to cleanup.
Now that the test harness in testsdk.bbclass has monkey-patched
CalledProcessException to display the output we don't need to do that in the
test case.
(From OE-Core rev: 9f0f6326083ee76b72b431fbfcbe12c1ab2793b2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/testsdk.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 802e57f55d..0e6949ed9f 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass | |||
| @@ -100,7 +100,7 @@ def testsdkext_main(d): | |||
| 100 | import logging | 100 | import logging |
| 101 | 101 | ||
| 102 | from bb.utils import export_proxies | 102 | from bb.utils import export_proxies |
| 103 | from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible | 103 | from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible, subprocesstweak |
| 104 | from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor | 104 | from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor |
| 105 | 105 | ||
| 106 | pn = d.getVar("PN") | 106 | pn = d.getVar("PN") |
| @@ -109,6 +109,8 @@ def testsdkext_main(d): | |||
| 109 | # extensible sdk use network | 109 | # extensible sdk use network |
| 110 | export_proxies(d) | 110 | export_proxies(d) |
| 111 | 111 | ||
| 112 | subprocesstweak.errors_have_output() | ||
| 113 | |||
| 112 | # extensible sdk can be contaminated if native programs are | 114 | # extensible sdk can be contaminated if native programs are |
| 113 | # in PATH, i.e. use perl-native instead of eSDK one. | 115 | # in PATH, i.e. use perl-native instead of eSDK one. |
| 114 | paths_to_avoid = [d.getVar('STAGING_DIR'), | 116 | paths_to_avoid = [d.getVar('STAGING_DIR'), |
