summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 12:19:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 22:11:22 +0000
commit7c3a0dc5978cea898b1ca51decf4d6e7cf9d519f (patch)
treed23c6794bcd86beb208edb12550600c1fc783fc5 /meta/lib
parent00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf (diff)
downloadopenembedded-core-contrib-7c3a0dc5978cea898b1ca51decf4d6e7cf9d519f.tar.gz
openembedded-core-contrib-7c3a0dc5978cea898b1ca51decf4d6e7cf9d519f.tar.bz2
openembedded-core-contrib-7c3a0dc5978cea898b1ca51decf4d6e7cf9d519f.zip
oeqa/selftest/buildoptions: Improve ccache test failure output
The current failure mode doesn't show us what the logs actually looked like and later cleans can lose them. Show the whole log in case of failure to aid debugging intermittent problems on the autobuilder. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 4ebfdb7123..9b87e7fcfc 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -40,8 +40,9 @@ class ImageOptionsTests(OESelftestTestCase):
self.add_command_to_tearDown('bitbake -c clean m4')
bitbake("m4 -f -c compile")
log_compile = os.path.join(get_bb_var("WORKDIR","m4"), "temp/log.do_compile")
- res = runCmd("grep ccache %s" % log_compile, ignore_status=True)
- self.assertEqual(0, res.status, msg="No match for ccache in m4 log.do_compile. For further details: %s" % log_compile)
+ with open(log_compile, "r") as f:
+ loglines = "".join(f.readlines())
+ self.assertIn("ccache", loglines, msg="No match for ccache in m4 log.do_compile. For further details: %s" % log_compile)
@OETestID(1435)
def test_read_only_image(self):