[libvirt PATCH 0/5] rpcgen: Fix test coverage
Right now we don't have pytest installed in any of the CI build environments, and tests are only executed when pytest is present, so the test coverage is exactly zero. This series changes things so that we actually run the test suite as part of the CI pipeline, which immediately triggers a build failure on macOS: In file included from ../scripts/rpcgen/tests/test_demo.c:7: ../scripts/rpcgen/tests/demo.c:402:10: error: call to undeclared function 'xdr_uint64_t'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] if (!xdr_uint64_t(xdrs, &objp->suh)) ^ ../scripts/rpcgen/tests/test_demo.c:25:29: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vorig); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:52:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:66:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ 4 errors generated. I haven't looked into that failure at all, but it looks like something that we might want to fix before 9.10.0 is released? libvirt itself seems to build fine, so perhaps it's just the test suite that needs fixing. I leave the call to people who are more familiar with the rpcgen situation. Andrea Bolognani (5): rpcgen: Don't skip all tests when pytest is missing rpcgen: Organize meson tests into suites rpcgen: Skip tests if tests are disabled rpcgen: Reformat meson files ci: Refresh generated files ci/buildenv/almalinux-8.sh | 1 + ci/buildenv/alpine-317.sh | 1 + ci/buildenv/alpine-edge.sh | 1 + ci/buildenv/centos-stream-8.sh | 1 + ci/buildenv/centos-stream-9.sh | 1 + ci/buildenv/debian-11-cross-aarch64.sh | 1 + ci/buildenv/debian-11-cross-armv6l.sh | 1 + ci/buildenv/debian-11-cross-armv7l.sh | 1 + ci/buildenv/debian-11-cross-i686.sh | 1 + ci/buildenv/debian-11-cross-mips64el.sh | 1 + ci/buildenv/debian-11-cross-mipsel.sh | 1 + ci/buildenv/debian-11-cross-ppc64le.sh | 1 + ci/buildenv/debian-11-cross-s390x.sh | 1 + ci/buildenv/debian-11.sh | 1 + ci/buildenv/debian-12-cross-aarch64.sh | 1 + ci/buildenv/debian-12-cross-armv6l.sh | 1 + ci/buildenv/debian-12-cross-armv7l.sh | 1 + ci/buildenv/debian-12-cross-i686.sh | 1 + ci/buildenv/debian-12-cross-mips64el.sh | 1 + ci/buildenv/debian-12-cross-mipsel.sh | 1 + ci/buildenv/debian-12-cross-ppc64le.sh | 1 + ci/buildenv/debian-12-cross-s390x.sh | 1 + ci/buildenv/debian-12.sh | 1 + ci/buildenv/debian-sid-cross-aarch64.sh | 1 + ci/buildenv/debian-sid-cross-armv6l.sh | 1 + ci/buildenv/debian-sid-cross-armv7l.sh | 1 + ci/buildenv/debian-sid-cross-i686.sh | 1 + ci/buildenv/debian-sid-cross-mips64el.sh | 1 + ci/buildenv/debian-sid-cross-ppc64le.sh | 1 + ci/buildenv/debian-sid-cross-s390x.sh | 1 + ci/buildenv/debian-sid.sh | 1 + ci/buildenv/fedora-37.sh | 1 + ci/buildenv/fedora-38-cross-mingw32.sh | 1 + ci/buildenv/fedora-38-cross-mingw64.sh | 1 + ci/buildenv/fedora-38.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 + ci/buildenv/fedora-rawhide.sh | 1 + ci/buildenv/opensuse-leap-15.sh | 1 + ci/buildenv/opensuse-tumbleweed.sh | 1 + ci/buildenv/ubuntu-2004.sh | 1 + ci/buildenv/ubuntu-2204.sh | 1 + ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/macos-13.vars | 2 +- ci/cirrus/macos-14.vars | 2 +- ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/alpine-317.Dockerfile | 1 + ci/containers/alpine-edge.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + .../debian-11-cross-aarch64.Dockerfile | 1 + .../debian-11-cross-armv6l.Dockerfile | 1 + .../debian-11-cross-armv7l.Dockerfile | 1 + ci/containers/debian-11-cross-i686.Dockerfile | 1 + .../debian-11-cross-mips64el.Dockerfile | 1 + .../debian-11-cross-mipsel.Dockerfile | 1 + .../debian-11-cross-ppc64le.Dockerfile | 1 + .../debian-11-cross-s390x.Dockerfile | 1 + ci/containers/debian-11.Dockerfile | 1 + .../debian-12-cross-aarch64.Dockerfile | 1 + .../debian-12-cross-armv6l.Dockerfile | 1 + .../debian-12-cross-armv7l.Dockerfile | 1 + ci/containers/debian-12-cross-i686.Dockerfile | 1 + .../debian-12-cross-mips64el.Dockerfile | 1 + .../debian-12-cross-mipsel.Dockerfile | 1 + .../debian-12-cross-ppc64le.Dockerfile | 1 + .../debian-12-cross-s390x.Dockerfile | 1 + ci/containers/debian-12.Dockerfile | 1 + .../debian-sid-cross-aarch64.Dockerfile | 1 + .../debian-sid-cross-armv6l.Dockerfile | 1 + .../debian-sid-cross-armv7l.Dockerfile | 1 + .../debian-sid-cross-i686.Dockerfile | 1 + .../debian-sid-cross-mips64el.Dockerfile | 1 + .../debian-sid-cross-ppc64le.Dockerfile | 1 + .../debian-sid-cross-s390x.Dockerfile | 1 + ci/containers/debian-sid.Dockerfile | 1 + ci/containers/fedora-37.Dockerfile | 1 + .../fedora-38-cross-mingw32.Dockerfile | 1 + .../fedora-38-cross-mingw64.Dockerfile | 1 + ci/containers/fedora-38.Dockerfile | 1 + .../fedora-rawhide-cross-mingw32.Dockerfile | 1 + .../fedora-rawhide-cross-mingw64.Dockerfile | 1 + ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-15.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + ci/containers/ubuntu-2004.Dockerfile | 1 + ci/containers/ubuntu-2204.Dockerfile | 1 + scripts/rpcgen/meson.build | 17 ++++++----- scripts/rpcgen/rpcgen/meson.build | 10 +++---- scripts/rpcgen/tests/meson.build | 29 ++++++++++--------- 91 files changed, 118 insertions(+), 30 deletions(-) -- 2.43.0
Some of the files used by test_demo.c can only be regenerated when pytest is present, but we have pre-generated copies in the repository, so overall we just need the C compiler to build and run that specific test program. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/rpcgen/meson.build b/scripts/rpcgen/meson.build index 65236457be..20e4c06dbc 100644 --- a/scripts/rpcgen/meson.build +++ b/scripts/rpcgen/meson.build @@ -1,8 +1,7 @@ subdir('rpcgen') +subdir('tests') if pytest_prog.found() - subdir('tests') - test( 'rpcgen-pytest', python3_prog, -- 2.43.0
These are currently the only tests that are not part of any suite. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 1 + scripts/rpcgen/tests/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/rpcgen/meson.build b/scripts/rpcgen/meson.build index 20e4c06dbc..d8d0e03784 100644 --- a/scripts/rpcgen/meson.build +++ b/scripts/rpcgen/meson.build @@ -8,6 +8,7 @@ if pytest_prog.found() args: [ '-mpytest' ] + rpcgen_tests, env: runutf8, workdir: meson.current_source_dir(), + suite: 'script', ) endif diff --git a/scripts/rpcgen/tests/meson.build b/scripts/rpcgen/tests/meson.build index dfd757de7c..10f504dab2 100644 --- a/scripts/rpcgen/tests/meson.build +++ b/scripts/rpcgen/tests/meson.build @@ -20,4 +20,5 @@ test( 'test_demo', test_demo, workdir: meson.current_source_dir(), + suite: 'bin', ) -- 2.43.0
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/rpcgen/meson.build b/scripts/rpcgen/meson.build index d8d0e03784..9e766a2a37 100644 --- a/scripts/rpcgen/meson.build +++ b/scripts/rpcgen/meson.build @@ -1,15 +1,18 @@ subdir('rpcgen') -subdir('tests') -if pytest_prog.found() - test( - 'rpcgen-pytest', - python3_prog, - args: [ '-mpytest' ] + rpcgen_tests, - env: runutf8, - workdir: meson.current_source_dir(), - suite: 'script', - ) +if tests_enabled[0] + subdir('tests') + + if pytest_prog.found() + test( + 'rpcgen-pytest', + python3_prog, + args: [ '-mpytest' ] + rpcgen_tests, + env: runutf8, + workdir: meson.current_source_dir(), + suite: 'script', + ) + endif endif rpcgen_prog = find_program('main.py') -- 2.43.0
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 16 ++++++++-------- scripts/rpcgen/rpcgen/meson.build | 10 +++++----- scripts/rpcgen/tests/meson.build | 30 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/scripts/rpcgen/meson.build b/scripts/rpcgen/meson.build index 9e766a2a37..7a8d505c61 100644 --- a/scripts/rpcgen/meson.build +++ b/scripts/rpcgen/meson.build @@ -4,14 +4,14 @@ if tests_enabled[0] subdir('tests') if pytest_prog.found() - test( - 'rpcgen-pytest', - python3_prog, - args: [ '-mpytest' ] + rpcgen_tests, - env: runutf8, - workdir: meson.current_source_dir(), - suite: 'script', - ) + test( + 'rpcgen-pytest', + python3_prog, + args: [ '-mpytest' ] + rpcgen_tests, + env: runutf8, + workdir: meson.current_source_dir(), + suite: 'script', + ) endif endif diff --git a/scripts/rpcgen/rpcgen/meson.build b/scripts/rpcgen/rpcgen/meson.build index 5a0f59eecf..9cd3e2e273 100644 --- a/scripts/rpcgen/rpcgen/meson.build +++ b/scripts/rpcgen/rpcgen/meson.build @@ -1,7 +1,7 @@ rpcgen_src = files([ - 'ast.py', - 'lexer.py', - 'generator.py', - 'parser.py', - 'visitor.py', + 'ast.py', + 'lexer.py', + 'generator.py', + 'parser.py', + 'visitor.py', ]) diff --git a/scripts/rpcgen/tests/meson.build b/scripts/rpcgen/tests/meson.build index 10f504dab2..057a61433d 100644 --- a/scripts/rpcgen/tests/meson.build +++ b/scripts/rpcgen/tests/meson.build @@ -1,24 +1,24 @@ rpcgen_tests = files([ - 'test_generator.py', - 'test_lexer.py', - 'test_parser.py', + 'test_generator.py', + 'test_lexer.py', + 'test_parser.py', ]) test_demo = executable( - 'test_demo', - [ 'test_demo.c' ], - c_args: [ - '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()), - ] + cc_flags_relaxed_frame_limit, - dependencies: [ - xdr_dep, glib_dep - ], + 'test_demo', + [ 'test_demo.c' ], + c_args: [ + '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()), + ] + cc_flags_relaxed_frame_limit, + dependencies: [ + xdr_dep, glib_dep + ], ) test( - 'test_demo', - test_demo, - workdir: meson.current_source_dir(), - suite: 'bin', + 'test_demo', + test_demo, + workdir: meson.current_source_dir(), + suite: 'bin', ) -- 2.43.0
This adds pytest everywhere. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/buildenv/almalinux-8.sh | 1 + ci/buildenv/alpine-317.sh | 1 + ci/buildenv/alpine-edge.sh | 1 + ci/buildenv/centos-stream-8.sh | 1 + ci/buildenv/centos-stream-9.sh | 1 + ci/buildenv/debian-11-cross-aarch64.sh | 1 + ci/buildenv/debian-11-cross-armv6l.sh | 1 + ci/buildenv/debian-11-cross-armv7l.sh | 1 + ci/buildenv/debian-11-cross-i686.sh | 1 + ci/buildenv/debian-11-cross-mips64el.sh | 1 + ci/buildenv/debian-11-cross-mipsel.sh | 1 + ci/buildenv/debian-11-cross-ppc64le.sh | 1 + ci/buildenv/debian-11-cross-s390x.sh | 1 + ci/buildenv/debian-11.sh | 1 + ci/buildenv/debian-12-cross-aarch64.sh | 1 + ci/buildenv/debian-12-cross-armv6l.sh | 1 + ci/buildenv/debian-12-cross-armv7l.sh | 1 + ci/buildenv/debian-12-cross-i686.sh | 1 + ci/buildenv/debian-12-cross-mips64el.sh | 1 + ci/buildenv/debian-12-cross-mipsel.sh | 1 + ci/buildenv/debian-12-cross-ppc64le.sh | 1 + ci/buildenv/debian-12-cross-s390x.sh | 1 + ci/buildenv/debian-12.sh | 1 + ci/buildenv/debian-sid-cross-aarch64.sh | 1 + ci/buildenv/debian-sid-cross-armv6l.sh | 1 + ci/buildenv/debian-sid-cross-armv7l.sh | 1 + ci/buildenv/debian-sid-cross-i686.sh | 1 + ci/buildenv/debian-sid-cross-mips64el.sh | 1 + ci/buildenv/debian-sid-cross-ppc64le.sh | 1 + ci/buildenv/debian-sid-cross-s390x.sh | 1 + ci/buildenv/debian-sid.sh | 1 + ci/buildenv/fedora-37.sh | 1 + ci/buildenv/fedora-38-cross-mingw32.sh | 1 + ci/buildenv/fedora-38-cross-mingw64.sh | 1 + ci/buildenv/fedora-38.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 + ci/buildenv/fedora-rawhide.sh | 1 + ci/buildenv/opensuse-leap-15.sh | 1 + ci/buildenv/opensuse-tumbleweed.sh | 1 + ci/buildenv/ubuntu-2004.sh | 1 + ci/buildenv/ubuntu-2204.sh | 1 + ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/macos-13.vars | 2 +- ci/cirrus/macos-14.vars | 2 +- ci/containers/almalinux-8.Dockerfile | 1 + ci/containers/alpine-317.Dockerfile | 1 + ci/containers/alpine-edge.Dockerfile | 1 + ci/containers/centos-stream-8.Dockerfile | 1 + ci/containers/centos-stream-9.Dockerfile | 1 + ci/containers/debian-11-cross-aarch64.Dockerfile | 1 + ci/containers/debian-11-cross-armv6l.Dockerfile | 1 + ci/containers/debian-11-cross-armv7l.Dockerfile | 1 + ci/containers/debian-11-cross-i686.Dockerfile | 1 + ci/containers/debian-11-cross-mips64el.Dockerfile | 1 + ci/containers/debian-11-cross-mipsel.Dockerfile | 1 + ci/containers/debian-11-cross-ppc64le.Dockerfile | 1 + ci/containers/debian-11-cross-s390x.Dockerfile | 1 + ci/containers/debian-11.Dockerfile | 1 + ci/containers/debian-12-cross-aarch64.Dockerfile | 1 + ci/containers/debian-12-cross-armv6l.Dockerfile | 1 + ci/containers/debian-12-cross-armv7l.Dockerfile | 1 + ci/containers/debian-12-cross-i686.Dockerfile | 1 + ci/containers/debian-12-cross-mips64el.Dockerfile | 1 + ci/containers/debian-12-cross-mipsel.Dockerfile | 1 + ci/containers/debian-12-cross-ppc64le.Dockerfile | 1 + ci/containers/debian-12-cross-s390x.Dockerfile | 1 + ci/containers/debian-12.Dockerfile | 1 + ci/containers/debian-sid-cross-aarch64.Dockerfile | 1 + ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 + ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 + ci/containers/debian-sid-cross-i686.Dockerfile | 1 + ci/containers/debian-sid-cross-mips64el.Dockerfile | 1 + ci/containers/debian-sid-cross-ppc64le.Dockerfile | 1 + ci/containers/debian-sid-cross-s390x.Dockerfile | 1 + ci/containers/debian-sid.Dockerfile | 1 + ci/containers/fedora-37.Dockerfile | 1 + ci/containers/fedora-38-cross-mingw32.Dockerfile | 1 + ci/containers/fedora-38-cross-mingw64.Dockerfile | 1 + ci/containers/fedora-38.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 1 + ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 1 + ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-leap-15.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 1 + ci/containers/ubuntu-2004.Dockerfile | 1 + ci/containers/ubuntu-2204.Dockerfile | 1 + 88 files changed, 88 insertions(+), 4 deletions(-) diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh index f127c0dc5a..0f0e66ef9a 100644 --- a/ci/buildenv/almalinux-8.sh +++ b/ci/buildenv/almalinux-8.sh @@ -73,6 +73,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-317.sh index 975914a7c2..d11c247051 100644 --- a/ci/buildenv/alpine-317.sh +++ b/ci/buildenv/alpine-317.sh @@ -57,6 +57,7 @@ function install_buildenv() { polkit \ py3-docutils \ py3-flake8 \ + py3-pytest \ python3 \ qemu-img \ readline-dev \ diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh index 975914a7c2..d11c247051 100644 --- a/ci/buildenv/alpine-edge.sh +++ b/ci/buildenv/alpine-edge.sh @@ -57,6 +57,7 @@ function install_buildenv() { polkit \ py3-docutils \ py3-flake8 \ + py3-pytest \ python3 \ qemu-img \ readline-dev \ diff --git a/ci/buildenv/centos-stream-8.sh b/ci/buildenv/centos-stream-8.sh index 0ccc86156a..58adc95633 100644 --- a/ci/buildenv/centos-stream-8.sh +++ b/ci/buildenv/centos-stream-8.sh @@ -74,6 +74,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index 475ee48e76..28960fff46 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -70,6 +70,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index fdf9344d6c..ba0062577f 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index a9e7328981..272cb71c8a 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 0f0f6ade82..4cbb2bddf1 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index 687c1491a8..9cb76c85c8 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index ab66269862..3960d6f949 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index d7ac79cb9c..787da13997 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index 65c452db0b..60fd2e116c 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index 4b7be31880..b703571016 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -40,6 +40,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 4cf08c45a7..353bc76567 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -75,6 +75,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 859c63dbc5..16857a60c8 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 97cf5d7b77..8d758a195b 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 785020b095..08e1b08d4d 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index ddcbbcaa92..37142cb0c3 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 2260e2f953..aab7c72a4f 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index f34ec9c04d..c188d46f41 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index 68e5144614..75b82147f9 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 093dafedcb..e537333efb 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index 781e61492f..5b259a243a 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -75,6 +75,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 859c63dbc5..16857a60c8 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 7cf2ddfe15..69a5612d01 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 09c5924019..2f59aa4203 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 3f5a12c398..f096fa88c6 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 2260e2f953..aab7c72a4f 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index 68e5144614..75b82147f9 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 093dafedcb..e537333efb 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -41,6 +41,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index 781e61492f..5b259a243a 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -75,6 +75,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-37.sh index 89a32cd7d1..10c5e1651f 100644 --- a/ci/buildenv/fedora-37.sh +++ b/ci/buildenv/fedora-37.sh @@ -70,6 +70,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/fedora-38-cross-mingw32.sh b/ci/buildenv/fedora-38-cross-mingw32.sh index 05f1046239..3b1479d945 100644 --- a/ci/buildenv/fedora-38-cross-mingw32.sh +++ b/ci/buildenv/fedora-38-cross-mingw32.sh @@ -41,6 +41,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/buildenv/fedora-38-cross-mingw64.sh b/ci/buildenv/fedora-38-cross-mingw64.sh index b41439b2b3..5ab11f7af1 100644 --- a/ci/buildenv/fedora-38-cross-mingw64.sh +++ b/ci/buildenv/fedora-38-cross-mingw64.sh @@ -41,6 +41,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-38.sh index 89a32cd7d1..10c5e1651f 100644 --- a/ci/buildenv/fedora-38.sh +++ b/ci/buildenv/fedora-38.sh @@ -70,6 +70,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh b/ci/buildenv/fedora-rawhide-cross-mingw32.sh index 72ef56aa67..2dba1c835b 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh @@ -42,6 +42,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh b/ci/buildenv/fedora-rawhide-cross-mingw64.sh index 77f2c3a2b4..9ccd1c9914 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh @@ -42,6 +42,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index 56d8199f70..198fb85659 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -71,6 +71,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index fd42033ac3..50fa733612 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -72,6 +72,7 @@ function install_buildenv() { python3-base \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-tools \ readline-devel \ rpm-build \ diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index 0c57fc43f1..56854136d3 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -71,6 +71,7 @@ function install_buildenv() { polkit \ python3-base \ python3-docutils \ + python3-pytest \ python39-flake8 \ qemu-tools \ readline-devel \ diff --git a/ci/buildenv/ubuntu-2004.sh b/ci/buildenv/ubuntu-2004.sh index c034e79cef..3572918758 100644 --- a/ci/buildenv/ubuntu-2004.sh +++ b/ci/buildenv/ubuntu-2004.sh @@ -76,6 +76,7 @@ function install_buildenv() { python3 \ python3-docutils \ python3-pip \ + python3-pytest \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 9f0fb1a545..153dd94209 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -76,6 +76,7 @@ function install_buildenv() { policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index b3b3d7a187..ec8b2e0faf 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index b3b3d7a187..ec8b2e0faf 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars index 33fc86e1f5..b059205480 100644 --- a/ci/cirrus/macos-13.vars +++ b/ci/cirrus/macos-13.vars @@ -12,5 +12,5 @@ NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl' -PYPI_PKGS='' +PYPI_PKGS='pytest' PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars index 33fc86e1f5..b059205480 100644 --- a/ci/cirrus/macos-14.vars +++ b/ci/cirrus/macos-14.vars @@ -12,5 +12,5 @@ NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl' -PYPI_PKGS='' +PYPI_PKGS='pytest' PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile index 3114dc2a7a..453fa28c7b 100644 --- a/ci/containers/almalinux-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -74,6 +74,7 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/alpine-317.Dockerfile b/ci/containers/alpine-317.Dockerfile index ff24996366..52a2caf5a0 100644 --- a/ci/containers/alpine-317.Dockerfile +++ b/ci/containers/alpine-317.Dockerfile @@ -58,6 +58,7 @@ RUN apk update && \ polkit \ py3-docutils \ py3-flake8 \ + py3-pytest \ python3 \ qemu-img \ readline-dev \ diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index d06563de15..aa78d00372 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -58,6 +58,7 @@ RUN apk update && \ polkit \ py3-docutils \ py3-flake8 \ + py3-pytest \ python3 \ qemu-img \ readline-dev \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 285e7275ba..1ca3bde68c 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -75,6 +75,7 @@ RUN dnf distro-sync -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index fb6e41fd27..6bc61fe816 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -71,6 +71,7 @@ RUN dnf distro-sync -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index 43425c59e3..4652009d5d 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index 0f63edd5cb..406c6eba49 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index 8b2be0fcc7..4d53743de0 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index 064f32a49b..52130cd52a 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 76408d73bc..8becb6eca9 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index 2421938da9..c41398f6e5 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 7f219e1e4f..ae17452b86 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index 22149e66b9..b3242bfecc 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -42,6 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 5981f3841f..313e9f8e32 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -77,6 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index bbd5f3e329..b1df77f686 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index 98ada6e45a..39326f8463 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index fdd853e84a..2f5cba03df 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 680a76a0e1..1241904b3b 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index 94504776d5..dd7eeb23db 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index 66a1bc278b..b320afbecd 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 63afe6f18c..79a785ecc5 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index ca707e2ec1..37564b3bf8 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 4e1155bcf6..8464b8ad93 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -77,6 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index d5d4659d67..c2670eba71 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 06a7240ce9..eef19ab72c 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 58ba4e15da..97c765bc7a 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index b3d82e4bd5..a6c90df0cc 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index bedce7d2f1..5cc740fe89 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 0ca0847267..996dd596d0 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 55aa2c9f36..757c9c4c3a 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -43,6 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 9b1af19e08..7145c0fcb5 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -77,6 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile index 35bb52b2a0..86ebc0f027 100644 --- a/ci/containers/fedora-37.Dockerfile +++ b/ci/containers/fedora-37.Dockerfile @@ -81,6 +81,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/fedora-38-cross-mingw32.Dockerfile b/ci/containers/fedora-38-cross-mingw32.Dockerfile index 34c8a5003d..27adb78658 100644 --- a/ci/containers/fedora-38-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-38-cross-mingw32.Dockerfile @@ -52,6 +52,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/containers/fedora-38-cross-mingw64.Dockerfile b/ci/containers/fedora-38-cross-mingw64.Dockerfile index d76b04d942..8d5a69f686 100644 --- a/ci/containers/fedora-38-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-38-cross-mingw64.Dockerfile @@ -52,6 +52,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/containers/fedora-38.Dockerfile b/ci/containers/fedora-38.Dockerfile index 6b2672463f..a47e4a484e 100644 --- a/ci/containers/fedora-38.Dockerfile +++ b/ci/containers/fedora-38.Dockerfile @@ -81,6 +81,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index d0f56e1c17..865fde2f8f 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -53,6 +53,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 5fdb20b752..0e1a23dbac 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -53,6 +53,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ rpm-build \ scrub \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index eafbd550e0..72e7d85643 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -82,6 +82,7 @@ exec "$@"\n' > /usr/bin/nosync && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-img \ readline-devel \ rpm-build \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 642eef70eb..748d764075 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -73,6 +73,7 @@ RUN zypper update -y && \ python3-base \ python3-docutils \ python3-flake8 \ + python3-pytest \ qemu-tools \ readline-devel \ rpm-build \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 0f1db78281..691553e9be 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -72,6 +72,7 @@ RUN zypper dist-upgrade -y && \ polkit \ python3-base \ python3-docutils \ + python3-pytest \ python39-flake8 \ qemu-tools \ readline-devel \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 830b9aad83..25d787f50a 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -78,6 +78,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3 \ python3-docutils \ python3-pip \ + python3-pytest \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 3d403baa31..47b9c3d7f9 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -78,6 +78,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pytest \ qemu-utils \ scrub \ sed \ -- 2.43.0
On Wed, Nov 29, 2023 at 06:18:27PM +0100, Andrea Bolognani wrote:
Right now we don't have pytest installed in any of the CI build environments, and tests are only executed when pytest is present, so the test coverage is exactly zero.
This series changes things so that we actually run the test suite as part of the CI pipeline, which immediately triggers a build failure on macOS:
In file included from ../scripts/rpcgen/tests/test_demo.c:7: ../scripts/rpcgen/tests/demo.c:402:10: error: call to undeclared function 'xdr_uint64_t'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] if (!xdr_uint64_t(xdrs, &objp->suh)) ^ ../scripts/rpcgen/tests/test_demo.c:25:29: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vorig); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:52:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:66:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ 4 errors generated.
I haven't looked into that failure at all, but it looks like something that we might want to fix before 9.10.0 is released? libvirt itself seems to build fine, so perhaps it's just the test suite that needs fixing. I leave the call to people who are more familiar with the rpcgen situation.
Andrea Bolognani (5): rpcgen: Don't skip all tests when pytest is missing rpcgen: Organize meson tests into suites rpcgen: Skip tests if tests are disabled rpcgen: Reformat meson files ci: Refresh generated files
I forgot to mention that this last commit is based on the following pending lcitool MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/446 -- Andrea Bolognani / Red Hat / Virtualization
On 11/29/23 18:18, Andrea Bolognani wrote:
Right now we don't have pytest installed in any of the CI build environments, and tests are only executed when pytest is present, so the test coverage is exactly zero.
This series changes things so that we actually run the test suite as part of the CI pipeline, which immediately triggers a build failure on macOS:
In file included from ../scripts/rpcgen/tests/test_demo.c:7: ../scripts/rpcgen/tests/demo.c:402:10: error: call to undeclared function 'xdr_uint64_t'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] if (!xdr_uint64_t(xdrs, &objp->suh)) ^ ../scripts/rpcgen/tests/test_demo.c:25:29: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vorig); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:52:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:66:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ 4 errors generated.
I suspect this is because on macos there's a different rpc library from libtirpc which compiles just fine.
I haven't looked into that failure at all, but it looks like something that we might want to fix before 9.10.0 is released? libvirt itself seems to build fine, so perhaps it's just the test suite that needs fixing. I leave the call to people who are more familiar with the rpcgen situation.
Andrea Bolognani (5): rpcgen: Don't skip all tests when pytest is missing rpcgen: Organize meson tests into suites rpcgen: Skip tests if tests are disabled rpcgen: Reformat meson files ci: Refresh generated files
91 files changed, 118 insertions(+), 30 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> And safe for freeze. Michal
On Wed, Nov 29, 2023 at 06:18:27PM +0100, Andrea Bolognani wrote:
Right now we don't have pytest installed in any of the CI build environments, and tests are only executed when pytest is present, so the test coverage is exactly zero.
This series changes things so that we actually run the test suite as part of the CI pipeline, which immediately triggers a build failure on macOS:
In file included from ../scripts/rpcgen/tests/test_demo.c:7: ../scripts/rpcgen/tests/demo.c:402:10: error: call to undeclared function 'xdr_uint64_t'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] if (!xdr_uint64_t(xdrs, &objp->suh)) ^ ../scripts/rpcgen/tests/test_demo.c:25:29: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vorig); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:52:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:66:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ 4 errors generated.
I haven't looked into that failure at all, but it looks like something that we might want to fix before 9.10.0 is released? libvirt itself seems to build fine, so perhaps it's just the test suite that needs fixing. I leave the call to people who are more familiar with the rpcgen situation.
I've just CC'd you on a possible patch. Could you test it with this series applied to verify the test suite passes. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Thu, Nov 30, 2023 at 09:24:45AM +0000, Daniel P. Berrangé wrote:
On Wed, Nov 29, 2023 at 06:18:27PM +0100, Andrea Bolognani wrote:
Right now we don't have pytest installed in any of the CI build environments, and tests are only executed when pytest is present, so the test coverage is exactly zero.
This series changes things so that we actually run the test suite as part of the CI pipeline, which immediately triggers a build failure on macOS:
In file included from ../scripts/rpcgen/tests/test_demo.c:7: ../scripts/rpcgen/tests/demo.c:402:10: error: call to undeclared function 'xdr_uint64_t'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] if (!xdr_uint64_t(xdrs, &objp->suh)) ^ ../scripts/rpcgen/tests/test_demo.c:25:29: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vorig); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:52:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ ../scripts/rpcgen/tests/test_demo.c:66:28: error: too few arguments to function call, expected 3, have 2 ret = !!proc(&xdr, vnew); ~~~~ ^ 4 errors generated.
I haven't looked into that failure at all, but it looks like something that we might want to fix before 9.10.0 is released? libvirt itself seems to build fine, so perhaps it's just the test suite that needs fixing. I leave the call to people who are more familiar with the rpcgen situation.
I've just CC'd you on a possible patch. Could you test it with this series applied to verify the test suite passes.
Replied there. Fix for the "too few arguments" error: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/23XME... -- Andrea Bolognani / Red Hat / Virtualization
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Michal Prívozník