diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-19 15:18:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 08:44:25 +0100 |
commit | 821cb0b819832feaebe656ed34e9236dedf6d673 (patch) | |
tree | 31a160d682cc2d5c4d862ee02bfef8de37066e45 /scripts/lib | |
parent | ac4682fc9cc3b7dd0f3f0201f5710e62890cd9c0 (diff) | |
download | poky-821cb0b819832feaebe656ed34e9236dedf6d673.tar.gz |
devtool: Setup logging before calling prepare
This avoids test failures like:
INFO - ======================================================================
INFO - FAIL [1.755s]: test_devtool_layer_plugins (devtool.DevtoolTests)
INFO - ----------------------------------------------------------------------
INFO - Traceback (most recent call last):
File "/media/build1/poky/meta/lib/oeqa/core/decorator/__init__.py", line 32, in wrapped_f
return func(*args, **kwargs)
File "/media/build1/poky/meta/lib/oeqa/selftest/cases/devtool.py", line 1354, in test_devtool_layer_plugins
self.assertEqual(result.output, s[::-1])
AssertionError: "NOTE: Starting bitbake server...\noY senu[36 chars]rciM" != "oY senuZ s'enoynA morF tiforP oN edaM tfosorciM"
- NOTE: Starting bitbake server...
oY senuZ s'enoynA morF tiforP oN edaM tfosorciM
INFO - ----------------------------------------------------------------------
since there is corruption in the output. Setting the logging up before
calling tinfoil.prepare() resolves this.
(From OE-Core rev: 3c479fb17ae4d3e7e5f0889af0f68257ef66475c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index bba0721543..b231e46b16 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py | |||
@@ -115,8 +115,8 @@ def setup_tinfoil(config_only=False, basepath=None, tracking=False): | |||
115 | import bb.tinfoil | 115 | import bb.tinfoil |
116 | tinfoil = bb.tinfoil.Tinfoil(tracking=tracking) | 116 | tinfoil = bb.tinfoil.Tinfoil(tracking=tracking) |
117 | try: | 117 | try: |
118 | tinfoil.prepare(config_only) | ||
119 | tinfoil.logger.setLevel(logger.getEffectiveLevel()) | 118 | tinfoil.logger.setLevel(logger.getEffectiveLevel()) |
119 | tinfoil.prepare(config_only) | ||
120 | except bb.tinfoil.TinfoilUIException: | 120 | except bb.tinfoil.TinfoilUIException: |
121 | tinfoil.shutdown() | 121 | tinfoil.shutdown() |
122 | raise DevtoolError('Failed to start bitbake environment') | 122 | raise DevtoolError('Failed to start bitbake environment') |