[libvirt PATCH 0/1] rpcgen: Skip generator tests on macOS
Based on: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/GLJL2... Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1091405064 Since we're supposed to tag 9.10.0 tomorrow, go for the quick and dirty workaround. Andrea Bolognani (1): rpcgen: Skip generator tests on macOS scripts/rpcgen/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.43.0
The generator can produce different code on Linux and macOS: specifically, on the former we want to use xdr_uint64_t while the latter needs xdr_u_int64_t instead. This is clearly a problem for tests that involve comparing the output produced against some expected output that's stored in the git repository. In the long run, we need to find a better way to handle this, but since 9.10.0 is going to be released very soon and we don't want it to have a broken test suite on macOS, simply skip the generator tests on that platform for now. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rpcgen/meson.build b/scripts/rpcgen/meson.build index 7a8d505c61..7fb32c0f91 100644 --- a/scripts/rpcgen/meson.build +++ b/scripts/rpcgen/meson.build @@ -3,7 +3,7 @@ subdir('rpcgen') if tests_enabled[0] subdir('tests') - if pytest_prog.found() + if pytest_prog.found() and host_machine.system() != 'darwin' test( 'rpcgen-pytest', python3_prog, -- 2.43.0
On Thu, Nov 30, 2023 at 08:29:55PM +0100, Andrea Bolognani wrote:
The generator can produce different code on Linux and macOS: specifically, on the former we want to use xdr_uint64_t while the latter needs xdr_u_int64_t instead.
This is clearly a problem for tests that involve comparing the output produced against some expected output that's stored in the git repository.
In the long run, we need to find a better way to handle this, but since 9.10.0 is going to be released very soon and we don't want it to have a broken test suite on macOS, simply skip the generator tests on that platform for now.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 Fri, Dec 01, 2023 at 11:58:05AM +0000, Daniel P. Berrangé wrote:
On Thu, Nov 30, 2023 at 08:29:55PM +0100, Andrea Bolognani wrote:
The generator can produce different code on Linux and macOS: specifically, on the former we want to use xdr_uint64_t while the latter needs xdr_u_int64_t instead.
This is clearly a problem for tests that involve comparing the output produced against some expected output that's stored in the git repository.
In the long run, we need to find a better way to handle this, but since 9.10.0 is going to be released very soon and we don't want it to have a broken test suite on macOS, simply skip the generator tests on that platform for now.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- scripts/rpcgen/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Thanks. I've pushed all pending rpcgen-related patches, including yours, since I had them neatly queued up already. We should be able to go ahead with the release now :) -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé