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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jul 12, 2016 at 10:45:12AM +0100, Daniel P. Berrange wrote:
On Tue, Jul 12, 2016 at 11:27:43AM +0200, Martin Kletzander wrote:
On Mon, Jul 11, 2016 at 09:55:00PM -0600, Eric Blake wrote:
> 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@xxxxxxxxxx>
> ---
> 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 */

Is taht really true?  For both cygwin and mingw?  If we can't mock on
WIN32 why don't we just disable those tests and the mocks in Makefile?
I wish I knew that when I was spending so much time fixing that gnulib
bug that was causing mingw fails for almost two months =)

Well historical practice for the tests directory is that we do it all
in the .c file, not the makefile. We could re-visit this, but if we
do then any change should be done throughout tests/, not just to this
file.


OK then, if that's the practice.  I forgot we are doing SKIPs for
unsupported tests.


Regards,
Daniel
--
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

Attachment: signature.asc
Description: Digital signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]