mbox

[PULL,00/14] Misc patches (functional tests, next-cube machine, ...)

Message ID 20241031174832.6574-1-thuth@redhat.com
State New
Headers show

Pull-request

https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-31

Message

Thomas Huth Oct. 31, 2024, 5:48 p.m. UTC 
The following changes since commit 58d49b5895f2e0b5cfe4b2901bf24f3320b74f29:

  Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging (2024-10-29 14:00:43 +0000)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-31

for you to fetch changes up to d73ad1b1c0e62976d4790606ee29725a0d8a8906:

  tests/functional: Convert the riscv_opensbi avocado test into a standalone test (2024-10-31 07:57:47 +0100)

----------------------------------------------------------------
* Remove the redundant macOS-15 CI job
* Various fixes, improvements and additions for the functional test suite
* Restore the sh4eb target
* Fix the OpenBSD VM test
* Re-enable the pci-bridge device on s390x
* Minor clean-ups / fixes for the next-cube machine

----------------------------------------------------------------
Daniel P. Berrangé (2):
      tests/functional: make tuxrun disk images writable
      tests/functional: make cached asset files read-only

Mark Cave-Ayland (2):
      next-cube: fix up compilation when DEBUG_NEXT is enabled
      next-cube: remove cpu parameter from next_scsi_init()

Thomas Huth (10):
      .gitlab-ci.d/cirrus: Remove the macos-15 job
      Revert "Remove the unused sh4eb target"
      tests/functional: Add a test for sh4eb
      tests/vm/openbsd: Remove the "Time appears wrong" workaround
      tests/functional: Fix the s390x and ppc64 tuxrun tests
      hw/s390x: Re-enable the pci-bridge device on s390x
      tests/functional: Convert the tcg_plugins test
      tests/functional: Convert BananaPi tests to the functional framework
      tests/functional: Convert the OrangePi tests to the functional framework
      tests/functional: Convert the riscv_opensbi avocado test into a standalone test

 MAINTAINERS                                        |   4 +-
 configs/devices/sh4eb-softmmu/default.mak          |   3 +
 configs/targets/sh4eb-softmmu.mak                  |   2 +
 qapi/machine.json                                  |   2 +-
 hw/m68k/next-cube.c                                |  14 +-
 tests/qtest/endianness-test.c                      |   1 +
 tests/qtest/machine-none-test.c                    |   1 +
 .gitlab-ci.d/buildtest.yml                         |   2 +-
 .gitlab-ci.d/cirrus.yml                            |  22 +-
 .gitlab-ci.d/cirrus/macos-15.vars                  |  16 -
 .gitlab-ci.d/crossbuilds.yml                       |   2 +-
 .travis.yml                                        |   2 +-
 hw/s390x/Kconfig                                   |   1 +
 tests/avocado/boot_linux_console.py                | 411 ---------------------
 tests/avocado/riscv_opensbi.py                     |  63 ----
 tests/functional/meson.build                       |  22 +-
 tests/functional/qemu_test/asset.py                |   3 +
 tests/functional/qemu_test/tuxruntest.py           |  10 +-
 tests/functional/qemu_test/utils.py                |  21 ++
 .../test_aarch64_tcg_plugins.py}                   |  37 +-
 tests/functional/test_arm_bpim2u.py                | 206 +++++++++++
 tests/functional/test_arm_orangepi.py              | 270 ++++++++++++++
 tests/functional/test_ppc64_tuxrun.py              |   4 +-
 tests/functional/test_riscv_opensbi.py             |  36 ++
 tests/functional/test_sh4eb_r2d.py                 |  33 ++
 tests/lcitool/refresh                              |   1 -
 tests/qemu-iotests/testenv.py                      |   1 +
 tests/qtest/meson.build                            |   1 +
 tests/vm/openbsd                                   |   1 -
 29 files changed, 641 insertions(+), 551 deletions(-)
 create mode 100644 configs/devices/sh4eb-softmmu/default.mak
 create mode 100644 configs/targets/sh4eb-softmmu.mak
 delete mode 100644 .gitlab-ci.d/cirrus/macos-15.vars
 delete mode 100644 tests/avocado/riscv_opensbi.py
 rename tests/{avocado/tcg_plugins.py => functional/test_aarch64_tcg_plugins.py} (78%)
 mode change 100644 => 100755
 create mode 100755 tests/functional/test_arm_bpim2u.py
 create mode 100755 tests/functional/test_arm_orangepi.py
 create mode 100755 tests/functional/test_riscv_opensbi.py
 create mode 100755 tests/functional/test_sh4eb_r2d.py

Comments

Peter Maydell Nov. 4, 2024, 12:31 p.m. UTC | #1 
On Thu, 31 Oct 2024 at 17:48, Thomas Huth <thuth@redhat.com> wrote:
>
> The following changes since commit 58d49b5895f2e0b5cfe4b2901bf24f3320b74f29:
>
>   Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging (2024-10-29 14:00:43 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-31
>
> for you to fetch changes up to d73ad1b1c0e62976d4790606ee29725a0d8a8906:
>
>   tests/functional: Convert the riscv_opensbi avocado test into a standalone test (2024-10-31 07:57:47 +0100)
>
> ----------------------------------------------------------------
> * Remove the redundant macOS-15 CI job
> * Various fixes, improvements and additions for the functional test suite
> * Restore the sh4eb target
> * Fix the OpenBSD VM test
> * Re-enable the pci-bridge device on s390x
> * Minor clean-ups / fixes for the next-cube machine
>
> ----------------------------------------------------------------
> Daniel P. Berrangé (2):
>       tests/functional: make tuxrun disk images writable
>       tests/functional: make cached asset files read-only
>
> Mark Cave-Ayland (2):
>       next-cube: fix up compilation when DEBUG_NEXT is enabled
>       next-cube: remove cpu parameter from next_scsi_init()
>
> Thomas Huth (10):
>       .gitlab-ci.d/cirrus: Remove the macos-15 job
>       Revert "Remove the unused sh4eb target"
>       tests/functional: Add a test for sh4eb
>       tests/vm/openbsd: Remove the "Time appears wrong" workaround
>       tests/functional: Fix the s390x and ppc64 tuxrun tests
>       hw/s390x: Re-enable the pci-bridge device on s390x
>       tests/functional: Convert the tcg_plugins test
>       tests/functional: Convert BananaPi tests to the functional framework
>       tests/functional: Convert the OrangePi tests to the functional framework
>       tests/functional: Convert the riscv_opensbi avocado test into a standalone test

Hi; the opensbi test seems to consistently time out on the s390 CI job:

https://gitlab.com/qemu-project/qemu/-/jobs/8260596592
https://gitlab.com/qemu-project/qemu/-/jobs/8260043983

789/972 qemu:func-quick+func-riscv32 / func-riscv32-riscv_opensbi
TIMEOUT 60.04s killed by signal 15 SIGTERM
791/972 qemu:func-quick+func-riscv64 / func-riscv64-riscv_opensbi
TIMEOUT 60.04s killed by signal 15 SIGTERM

thanks
-- PMM
Thomas Huth Nov. 4, 2024, 1:14 p.m. UTC | #2 
On 04/11/2024 13.31, Peter Maydell wrote:
> On Thu, 31 Oct 2024 at 17:48, Thomas Huth <thuth@redhat.com> wrote:
>>
>> The following changes since commit 58d49b5895f2e0b5cfe4b2901bf24f3320b74f29:
>>
>>    Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging (2024-10-29 14:00:43 +0000)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-31
>>
>> for you to fetch changes up to d73ad1b1c0e62976d4790606ee29725a0d8a8906:
>>
>>    tests/functional: Convert the riscv_opensbi avocado test into a standalone test (2024-10-31 07:57:47 +0100)
>>
>> ----------------------------------------------------------------
>> * Remove the redundant macOS-15 CI job
>> * Various fixes, improvements and additions for the functional test suite
>> * Restore the sh4eb target
>> * Fix the OpenBSD VM test
>> * Re-enable the pci-bridge device on s390x
>> * Minor clean-ups / fixes for the next-cube machine
>>
>> ----------------------------------------------------------------
>> Daniel P. Berrangé (2):
>>        tests/functional: make tuxrun disk images writable
>>        tests/functional: make cached asset files read-only
>>
>> Mark Cave-Ayland (2):
>>        next-cube: fix up compilation when DEBUG_NEXT is enabled
>>        next-cube: remove cpu parameter from next_scsi_init()
>>
>> Thomas Huth (10):
>>        .gitlab-ci.d/cirrus: Remove the macos-15 job
>>        Revert "Remove the unused sh4eb target"
>>        tests/functional: Add a test for sh4eb
>>        tests/vm/openbsd: Remove the "Time appears wrong" workaround
>>        tests/functional: Fix the s390x and ppc64 tuxrun tests
>>        hw/s390x: Re-enable the pci-bridge device on s390x
>>        tests/functional: Convert the tcg_plugins test
>>        tests/functional: Convert BananaPi tests to the functional framework
>>        tests/functional: Convert the OrangePi tests to the functional framework
>>        tests/functional: Convert the riscv_opensbi avocado test into a standalone test
> 
> Hi; the opensbi test seems to consistently time out on the s390 CI job:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/8260596592
> https://gitlab.com/qemu-project/qemu/-/jobs/8260043983
> 
> 789/972 qemu:func-quick+func-riscv32 / func-riscv32-riscv_opensbi
> TIMEOUT 60.04s killed by signal 15 SIGTERM
> 791/972 qemu:func-quick+func-riscv64 / func-riscv64-riscv_opensbi
> TIMEOUT 60.04s killed by signal 15 SIGTERM

Oh, interesting, that looks like a recent regression - running riscv on 
s390x hosts used to work last week, but with the current master it seems to 
be broken.

I'll respin the pull request without this patch (so that the other fixes are 
not blocked by this), while trying to find out where riscv breaks on big 
endian hosts...

  Thomas