From: Chen Qi Date: Fri, 1 Jun 2018 05:03:10 +0000 (+0800) Subject: testimage.bbclass: move codes into testimage_main X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d55013db85db28bb061b40976cdda7022fa1eb22;p=openembedded-core.git testimage.bbclass: move codes into testimage_main testimage-auto is expected to run testimage task's codes automatically. But in fact, it's currently missing some codes, including testimage_sanity and create_rpm_index. This leads to the problem of unexpected runtime failure of test_dnf_makecache. The error message is as below. RESULTS - dnf.DnfRepoTest.test_dnf_makecache - Testcase 1744: ERROR This error is caused by the fact that create_rpm_index is not executed before running the tests. There's no reason why such codes should not be in testimage_main, so move them into it. (From OE-Core rev: fa7ba486ded13907f63f9300f66350ba2835a3f7) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index fd744c71dc..9feb26770a 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -117,13 +117,6 @@ testimage_dump_host () { } python do_testimage() { - - testimage_sanity(d) - - if (d.getVar('IMAGE_PKGTYPE') == 'rpm' - and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))): - create_rpm_index(d) - testimage_main(d) } @@ -159,6 +152,12 @@ def testimage_main(d): """ raise RuntimeError + testimage_sanity(d) + + if (d.getVar('IMAGE_PKGTYPE') == 'rpm' + and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))): + create_rpm_index(d) + logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) pn = d.getVar("PN")