diff --git a/tests/Makefile.am b/tests/Makefile.am index 91eeeac6b57c7a292081ee89d9b8953da4d2e89b..c374f1452e618ecb51779e442b41eb7913f4b9be 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-2014 Red Hat, Inc. ## ## This library is free software; you can redistribute it and/or ## modify it under the terms of the GNU Lesser General Public @@ -333,10 +333,11 @@ test_libraries = libshunload.la \ virnetserverclientmock.la \ vircgroupmock.la \ virpcimock.la \ - qemuxml2argvmock.la \ $(NULL) if WITH_QEMU -test_libraries += libqemumonitortestutils.la +test_libraries += libqemumonitortestutils.la \ + qemuxml2argvmock.la \ + $(NULL) endif WITH_QEMU if WITH_DBUS diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 7fe18df55fcea4fdaa5322da386f7b737e1f41aa..34843e314d1979cafc902b886b9b8fd5d19f3a80 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -21,15 +21,18 @@ #include #include #include "virfile.h" +#include "testutils.h" -#ifdef MOCK_HELPER -# include "internal.h" -# include -# include -# include -# include -# include -# include +#if HAVE_DLFCN_H + +# ifdef MOCK_HELPER +# include "internal.h" +# include +# include +# include +# include +# include +# include static bool host_has_ipv6 = false; static int (*realsocket)(int domain, int type, int protocol); @@ -102,17 +105,16 @@ int bind(int sockfd ATTRIBUTE_UNUSED, return 0; } -#else +# else -# include "testutils.h" -# include "virutil.h" -# include "virerror.h" -# include "viralloc.h" -# include "virlog.h" -# include "virportallocator.h" -# include "virstring.h" +# include "virutil.h" +# include "virerror.h" +# include "viralloc.h" +# include "virlog.h" +# include "virportallocator.h" +# include "virstring.h" -# define VIR_FROM_THIS VIR_FROM_RPC +# define VIR_FROM_THIS VIR_FROM_RPC static int testAllocAll(const void *args ATTRIBUTE_UNUSED) @@ -261,4 +263,12 @@ mymain(void) } VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libvirportallocatormock.so") +# endif + +#else /* ! HAVE_DLFCN_H */ +int +main(void) +{ + return EXIT_AM_SKIP; +} #endif