| Message ID | 20220620150246.3171-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ci: work around zephyr test issues | expand |
On Mon, 20 Jun 2022 11:02:46 -0400, Jon Mason wrote: > zephyr uses icount to improve test accuracy on virtual hardware. Do > the same here for the same reason for the platforms that actually test. > Also, the common test now appears to work for microbit-v1 and poll doe > snot work for qemu-cortex-m3 Applied, thanks! [1/1] ci: work around zephyr test issues commit: 658de4e5e266cf3542bc88da4519f861f75f07a8 Best regards,
On Mon, 20 Jun 2022 11:02:46 -0400, Jon Mason wrote: > zephyr uses icount to improve test accuracy on virtual hardware. Do > the same here for the same reason for the platforms that actually test. > Also, the common test now appears to work for microbit-v1 and poll doe > snot work for qemu-cortex-m3 Applied, thanks! [1/1] ci: work around zephyr test issues commit: af928569b421431347c84f5941cee7aaa9f0ac74 Best regards,
diff --git a/ci/microbit-v1.yml b/ci/microbit-v1.yml index d78af2b2..b8501486 100644 --- a/ci/microbit-v1.yml +++ b/ci/microbit-v1.yml @@ -4,8 +4,4 @@ header: - ci/base.yml - ci/meta-zephyr.yml -local_conf_header: - failing_tests: | - ZEPHYRTESTS:remove = "common" - machine: microbit-v1 diff --git a/ci/qemu-cortex-m3.yml b/ci/qemu-cortex-m3.yml index 8a96037c..6f892a9e 100644 --- a/ci/qemu-cortex-m3.yml +++ b/ci/qemu-cortex-m3.yml @@ -13,6 +13,8 @@ local_conf_header: tclibc: | TCLIBC = "newlib" nonbuilding_tests: | - ZEPHYRTESTS:remove = "context pending sleep" + ZEPHYRTESTS:remove = "context pending poll sleep" + qemu_opts: | + QB_OPT_APPEND = "-icount shift=3,align=off,sleep=on -rtc clock=vm" machine: qemu-cortex-m3 diff --git a/meta-arm/conf/machine/microbit-v1.conf b/meta-arm/conf/machine/microbit-v1.conf index 6b18191e..ef3872fe 100644 --- a/meta-arm/conf/machine/microbit-v1.conf +++ b/meta-arm/conf/machine/microbit-v1.conf @@ -16,6 +16,7 @@ QB_MACHINE = "-machine microbit" QB_CPU = "-cpu cortex-m0" QB_GRAPHICS = "-nographic -vga none" QB_RNG = "" +QB_OPT_APPEND = "-icount shift=6,align=off,sleep=on -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_BOARD = "qemu_cortex_m0"
zephyr uses icount to improve test accuracy on virtual hardware. Do the same here for the same reason for the platforms that actually test. Also, the common test now appears to work for microbit-v1 and poll doe snot work for qemu-cortex-m3 Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/microbit-v1.yml | 4 ---- ci/qemu-cortex-m3.yml | 4 +++- meta-arm/conf/machine/microbit-v1.conf | 1 + 3 files changed, 4 insertions(+), 5 deletions(-)