External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: avoid dlsym mocking on mingw

Browse Source 
I got a build failure when cross-compiling to mingw with the
mingw64-dbus package installed:

  CC       virmockdbus_la-virmockdbus.lo
../../tests/virmockdbus.c:29:6: error: 'dbus_connection_set_change_sigpipe' redeclared without dllimport attribute: previous dllimport ignored [-Werror=attributes]
 VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_change_sigpipe,
      ^
../../tests/virmockdbus.c:33:18: error: 'dbus_bus_get' redeclared without dllimport attribute: previous dllimport ignored [-Werror=attributes]
 VIR_MOCK_STUB_RET_ARGS(dbus_bus_get,
...

Well duh - mingw lacks dlopen and friends, even if it can support
dbus.  A similar failure occured in virsystemdtest.c; but in that
file, we know that systemd is a Linux-only concept.

* tests/virmockdbus.c: Cripple on mingw.
* tests/virsystemdtest.c: Cripple on non-Linux.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-05-20 15:04:44 -06:00
parent cb6681ff1d
commit fa8701ea2b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/virmockdbus.c
View File

@ -1,7 +1,7 @@
/* /*
* virmockdbus.c: mocking of dbus message send/reply * virmockdbus.c: mocking of dbus message send/reply
* *
* Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2013-2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -22,7 +22,7 @@
#include <config.h> #include <config.h>
#ifdef WITH_DBUS #if defined(WITH_DBUS) && !defined(WIN32)
# include "virmock.h" # include "virmock.h"
# include <dbus/dbus.h> # include <dbus/dbus.h>
@ -61,4 +61,4 @@ VIR_MOCK_LINK_RET_ARGS(dbus_connection_send_with_reply_and_block,
int, timeout_milliseconds, int, timeout_milliseconds,
DBusError *, error) DBusError *, error)
#endif /* WITH_DBUS */ #endif /* WITH_DBUS && !WIN32 */

4
tests/virsystemdtest.c
View File

@ -22,7 +22,7 @@
#include "testutils.h" #include "testutils.h"
#ifdef WITH_DBUS #if defined(WITH_DBUS) && defined(__linux__)
# include <stdlib.h> # include <stdlib.h>
# include <dbus/dbus.h> # include <dbus/dbus.h>
@ -477,7 +477,7 @@ mymain(void)
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so") VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmockdbus.so")
#else /* ! WITH_DBUS */ #else /* ! (WITH_DBUS && __linux__) */
int int
main(void) main(void)
{ {