diff --git a/qemu.changes b/qemu.changes index 27fe90cf..bb3f55c1 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 30 12:48:20 UTC 2022 - Dirk Müller + +- skip tests that don't work under qemu-linux-user emulation + ------------------------------------------------------------------- Wed Sep 28 16:35:10 UTC 2022 - Dario Faggioli diff --git a/qemu.spec b/qemu.spec index b25737de..6129fc2a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -2348,6 +2348,11 @@ cd %blddir # If that patch is removed, the following line needs to go as well. cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ +%if 0%{?qemu_user_space_build} +# Seccomp is not supported by linux-user emulation +echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c +%endif + # Compile the QOM test binary first, so that ... %make_build tests/qtest/qom-test # ... make comes in fresh and has lots of address space (needed for 32bit, bsc#957379) @@ -2365,7 +2370,9 @@ cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ make -O V=1 VERBOSE=1 -j1 check-block # Run qtests in parallel. If it becomes unreliable, we can try something # like this: make -O V=1 VERBOSE=1 -j1 check-qtest +%if !0%{?qemu_user_space_build} %make_build check-qtest +%endif # Last step will be to run a full check-report, but we will # enable this at a later point #make -O V=1 VERBOSE=1 -j1 check-report.junit.xml diff --git a/qemu.spec.in b/qemu.spec.in index 63338217..251d7d63 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -2294,6 +2294,11 @@ cd %blddir # If that patch is removed, the following line needs to go as well. cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ +%if 0%{?qemu_user_space_build} +# Seccomp is not supported by linux-user emulation +echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c +%endif + # Compile the QOM test binary first, so that ... %make_build tests/qtest/qom-test # ... make comes in fresh and has lots of address space (needed for 32bit, bsc#957379) @@ -2311,7 +2316,9 @@ cp %{SOURCE202} %{srcdir}/tests/data/acpi/microvm/ make -O V=1 VERBOSE=1 -j1 check-block # Run qtests in parallel. If it becomes unreliable, we can try something # like this: make -O V=1 VERBOSE=1 -j1 check-qtest +%if !0%{?qemu_user_space_build} %make_build check-qtest +%endif # Last step will be to run a full check-report, but we will # enable this at a later point #make -O V=1 VERBOSE=1 -j1 check-report.junit.xml