Mon Nov 26 12:03:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

* tests/Makefile.am, tests/nodeinfotest.c, tests/qemuxml2argvtest.c,
	  tests/qemuxml2xmltest.c, tests/sexpr2xmltest.c, tests/virshtest.c,
	  tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
	  Miscellaneous fixes to the tests to compile under Cygwin.
This commit is contained in:
Richard W.M. Jones 2007-11-26 12:03:34 +00:00
parent fe9d013c3e
commit b7641686a6
10 changed files with 85 additions and 13 deletions

View File

@ -1,3 +1,10 @@
Mon Nov 26 12:03:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* tests/Makefile.am, tests/nodeinfotest.c, tests/qemuxml2argvtest.c,
tests/qemuxml2xmltest.c, tests/sexpr2xmltest.c, tests/virshtest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Miscellaneous fixes to the tests to compile under Cygwin.
Mon Nov 26 11:56:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* qemud/qemud.c: If AF_INET6 not defined, don't test for it.

View File

@ -70,63 +70,65 @@ xmlrpctest_SOURCES = \
@top_srcdir@/src/xmlrpc.c \
@top_srcdir@/src/xmlrpc.h
xmlrpctest_LDFLAGS =
LIBOBJDIR = ../src/
xmlrpctest_LDFLAGS = $(LIBOBJS)
xmlrpctest_LDADD = $(LDADDS)
xml2sexprtest_SOURCES = \
xml2sexprtest.c \
testutils.c testutils.h
xml2sexprtest_LDFLAGS =
xml2sexprtest_LDFLAGS = $(LIBOBJS)
xml2sexprtest_LDADD = $(LDADDS)
sexpr2xmltest_SOURCES = \
sexpr2xmltest.c \
testutils.c testutils.h
sexpr2xmltest_LDFLAGS =
sexpr2xmltest_LDFLAGS = $(LIBOBJS)
sexpr2xmltest_LDADD = $(LDADDS)
xmconfigtest_SOURCES = \
xmconfigtest.c \
testutils.c testutils.h
xmconfigtest_LDFLAGS =
xmconfigtest_LDFLAGS = $(LIBOBJS)
xmconfigtest_LDADD = $(LDADDS)
qemuxml2argvtest_SOURCES = \
qemuxml2argvtest.c \
testutils.c testutils.h
qemuxml2argvtest_LDFLAGS =
qemuxml2argvtest_LDFLAGS = $(LIBOBJS)
qemuxml2argvtest_LDADD = $(LDADDS)
qemuxml2xmltest_SOURCES = \
qemuxml2xmltest.c \
testutils.c testutils.h
qemuxml2xmltest_LDFLAGS =
qemuxml2xmltest_LDFLAGS = $(LIBOBJS)
qemuxml2xmltest_LDADD = $(LDADDS)
virshtest_SOURCES = \
virshtest.c \
testutils.c testutils.h
virshtest_LDFLAGS =
virshtest_LDFLAGS = $(LIBOBJS)
virshtest_LDADD = $(LDADDS)
conftest_SOURCES = \
conftest.c
conftest_LDFLAGS =
conftest_LDFLAGS = $(LIBOBJS)
conftest_LDADD = $(LDADDS)
xencapstest_SOURCES = \
xencapstest.c testutils.h testutils.c
xencapstest_LDFLAGS =
xencapstest_LDFLAGS = $(LIBOBJS)
xencapstest_LDADD = $(LDADDS)
nodeinfotest_SOURCES = \
nodeinfotest.c testutils.h testutils.c
nodeinfotest_LDFLAGS =
nodeinfotest_LDFLAGS = $(LIBOBJS)
nodeinfotest_LDADD = $(LDADDS)
reconnect_SOURCES = \
reconnect.c
reconnect_LDFLAGS =
reconnect_LDFLAGS = $(LIBOBJS)
reconnect_LDADD = $(LDADDS)
$(LIBVIRT):

View File

@ -1,7 +1,11 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include "config.h"
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#include <string.h>

View File

@ -1,9 +1,19 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifdef WITH_QEMU
#include "testutils.h"
#include "qemu_conf.h"
#include "internal.h"
@ -187,6 +197,12 @@ main(int argc, char **argv)
exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
#else
int main (void) { exit (77); /* means 'test skipped' for automake */ }
#endif /* WITH_QEMU */
/*
* Local variables:
* indent-tabs-mode: nil

View File

@ -1,9 +1,19 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifdef WITH_QEMU
#include "testutils.h"
#include "qemu_conf.h"
#include "internal.h"
@ -150,6 +160,12 @@ main(int argc, char **argv)
exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
#else
int main (void) { exit (77); /* means 'test skipped' to automake */ }
#endif /* WITH_QEMU */
/*
* Local variables:
* indent-tabs-mode: nil

View File

@ -1,6 +1,12 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifdef WITH_XEN
#include "xml.h"
#include "xend_internal.h"

View File

@ -1,9 +1,14 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <limits.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#include "xml.h"
#include "testutils.h"
#include "internal.h"

View File

@ -1,7 +1,11 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include "config.h"
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifdef WITH_XEN

View File

@ -21,9 +21,15 @@
*
*/
#include "config.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifdef WITH_XEN
#include "xen_unified.h"
#include "xm_internal.h"

View File

@ -1,9 +1,15 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#include "xml.h"
#include "testutils.h"
#include "internal.h"