real_close() is not inialized by the first invocation of close(). That causes an issue when the mock is used before others and a call of real_close() results in a jump to NULL pointer. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com&gt; --- tests/virpcimock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 064218d275..438cb7a672 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -1123,6 +1123,8 @@ opendir(const char *path) int close(int fd) { + init_syms(); + if (remove_fd(fd) < 0) return -1; return real_close(fd); -- 2.28.0

Commit f00cde7f1133 changed order of mount arguments in virStorageBackendFileSystemMountGlusterArgs() and introduced per-OS mount options and new test data. Old test data was left unmodified with prior order of arguments. That causes a test failure on all OSes but Linux and FreeBSD, i.e. on macOS: 15) Storage Pool XML-2-argv pool-netfs-gluster ... In '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv': Offset 39 Expect [-o direct-io-mode=1 /mnt/gluster] Actual [/mnt/gluster -o direct-io-mode=1] Fixes: f00cde7f1133 ("storage: Add default mount options for fs/netfs storage pools") Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com&gt; --- tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv index 4303d514ef..97be9cbeb3 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv @@ -1 +1 @@ -mount -t glusterfs example.com:/volume -o direct-io-mode=1 /mnt/gluster +mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1 -- 2.28.0