[libvirt] [PATCH 1/2] build: virrandommock.c not needed on mingw

Eric Blake eblake at redhat.com
Tue Jul 12 03:55:00 UTC 2016


We can't mock tests on Mingw, which lacks dlopen() and friends;
follow the paradigms used in other mock files of conditionally
compiling nothing when not building for Linux.

Signed-off-by: Eric Blake <eblake at redhat.com>
---
 tests/virrandommock.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/virrandommock.c b/tests/virrandommock.c
index 1f2434e..a69712a 100644
--- a/tests/virrandommock.c
+++ b/tests/virrandommock.c
@@ -20,11 +20,13 @@

 #include <config.h>

-#include "internal.h"
-#include "virrandom.h"
-#include "virmock.h"
+#ifndef WIN32

-#define VIR_FROM_THIS VIR_FROM_NONE
+# include "internal.h"
+# include "virrandom.h"
+# include "virmock.h"
+
+# define VIR_FROM_THIS VIR_FROM_NONE

 int
 virRandomBytes(unsigned char *buf,
@@ -39,9 +41,9 @@ virRandomBytes(unsigned char *buf,
 }


-#ifdef WITH_GNUTLS
-# include <stdio.h>
-# include <gnutls/gnutls.h>
+# ifdef WITH_GNUTLS
+#  include <stdio.h>
+#  include <gnutls/gnutls.h>

 static int (*real_gnutls_dh_params_generate2)(gnutls_dh_params_t dparams,
                                               unsigned int bits);
@@ -76,4 +78,7 @@ gnutls_dh_params_generate2(gnutls_dh_params_t dparams,

     return gnutls_dh_params_cpy(dparams, params_cache);
 }
+# endif
+#else /* WIN32 */
+/* Can't mock on WIN32 */
 #endif
-- 
2.5.5




More information about the libvir-list mailing list