From 029c414cd5df413ac16d2e8bfb5c72dcbd7670e7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 27 Nov 2018 12:19:39 +0000 Subject: [PATCH] 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. (From OE-Core rev: 7c3a0dc5978cea898b1ca51decf4d6e7cf9d519f) (From OE-Core rev: 60b58e976dcc2a45a036e18cfcc87933a8859c9f) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/buildoptions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py index e60e32dadf..406b7e8a4c 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):