From: Mikko Rapeli Date: Wed, 20 Nov 2024 10:10:07 +0000 (+0200) Subject: testimage.bbclass: change test failure logging from bb.fatal() to bb.error() X-Git-Tag: yocto-5.2~1271 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=077bdd26e6c5bd161f082524ceee9e90d56315b5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git testimage.bbclass: change test failure logging from bb.fatal() to bb.error() bb.fatal() exists right away while bb.error() does some cleanup before exiting. Fixes running tests during image build with TESTIMAGE_AUTO multiple times in a row when some of the tests fail: $ killall -9 Cooker ; bitbake -c clean core-image-base ; \ bitbake core-image-base ; \ bitbake core-image-base With bb.fatal() something in cleanup is not done and second image build builds an empty rootfs into .wic image. Workaround is to kill Cooker processes between bitbake calls, or to switch testimage.bbclass from bb.fatal() to bb.error() logging which is done here. Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 19075ce1f30..5463170fa53 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -399,9 +399,9 @@ def testimage_main(d): os.symlink(d.getVar("BB_LOGFILE"), os.path.join(targetdir, os.path.basename(d.getVar("BB_LOGFILE") + "." + d.getVar('DATETIME')))) if not results or not complete: - bb.fatal('%s - FAILED - tests were interrupted during execution, check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True) + bb.error('%s - FAILED - tests were interrupted during execution, check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True) if not results.wasSuccessful(): - bb.fatal('%s - FAILED - also check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True) + bb.error('%s - FAILED - also check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True) def get_runtime_paths(d): """