[poky] [PATCH 1/3] imagetest-qemu: Allow the task to run after any rootfs is created and also standalone

[Xu, Jiajun]

> One bitbake invocation can cause multiple images to be generated. We
> should test each one and we cna do this by running after the rootfs
> task. Running the tests standlone is also still possible with a new separate standlone task.
> 
> Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
> ---
>  meta/classes/imagetest-qemu.bbclass |   19 ++++++++++++++-----
>  1 files changed, 14 insertions(+), 5 deletions(-)
> diff --git a/meta/classes/imagetest-qemu.bbclass
> b/meta/classes/imagetest-qemu.bbclass index 07bdf01..3c1586e 100644 ---
> a/meta/classes/imagetest-qemu.bbclass +++
> b/meta/classes/imagetest-qemu.bbclass @@ -1,8 +1,3 @@ -addtask
> qemuimagetest before do_build -# after do_rootfs
> -do_qemuimagetest[nostamp] = "1" -do_qemuimagetest[depends] +=
> "qemu-native:do_populate_sysroot" -
>  # Test related variables
>  # By default, TEST_DIR is created under WORKDIR  TEST_DIR ?=
> "${WORKDIR}/qemuimagetest"
> @@ -12,6 +7,20 @@ TEST_TMP ?= "${TEST_DIR}/tmp"
>  TEST_SCEN ?= "sanity"
>  
>  python do_qemuimagetest() {
> +    qemuimagetest_main(d) +} +addtask qemuimagetest before do_build
> after do_rootfs +do_qemuimagetest[nostamp] = "1"
> +do_qemuimagetest[depends] += "qemu-native:do_populate_sysroot" +
> +python do_qemuimagetest_standalone() { +    qemuimagetest_main(d) +}
> +addtask qemuimagetest_standalone +do_qemuimagetest_standalone[nostamp]
> = "1" +do_qemuimagetest_standalone[depends] +=
> "qemu-native:do_populate_sysroot" + +python qemuimagetest_main(d) {
>      import sys
>      import re
>      import os

Hi Richard,
Seems we should use keyword "def" qemuimagetest_main definition. After this modification, it can work on my side.

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 07bdf01..8751eeb 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -1,8 +1,3 @@
-addtask qemuimagetest before do_build
-# after do_rootfs
-do_qemuimagetest[nostamp] = "1"
-do_qemuimagetest[depends] += "qemu-native:do_populate_sysroot"
-
 # Test related variables
 # By default, TEST_DIR is created under WORKDIR
 TEST_DIR ?= "${WORKDIR}/qemuimagetest"
@@ -11,7 +6,21 @@ TEST_RESULT ?= "${TEST_DIR}/result"
 TEST_TMP ?= "${TEST_DIR}/tmp"
 TEST_SCEN ?= "sanity"

-python do_qemuimagetest() {
+python do_qemuimagetest(){
+    qemuimagetest_main(d)
+}
+addtask qemuimagetest before do_build after do_rootfs
+do_qemuimagetest[nostamp] = "1"
+do_qemuimagetest[depends] += "qemu-native:do_populate_sysroot"
+
+python do_qemuimagetest_standalone(){
+    qemuimagetest_main(d)
+}
+addtask qemuimagetest_standalone
+do_qemuimagetest_standalone[nostamp] = "1"
+do_qemuimagetest_standalone[depends] += "qemu-native:do_populate_sysroot"
+
+def qemuimagetest_main(d):
     import sys
     import re
     import os
@@ -142,4 +151,3 @@ python do_qemuimagetest() {

     if ret != 0:
         raise bb.build.FuncFailed("Some testcases fail, pls. check test result and test log!!!")
-}


Best Regards,
Jiajun