Okay, *this* one seems to be a complete fix.
Dave
tests/Makefile.am | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
On Fri, 2008-11-21 at 12:35 -0500, David Lively wrote:
> Hold off on considering this quite yet. I don't think it's a complete
> fix. I'll followup with a complete one soon.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2d1254..a17fdd4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,11 @@
SHELL = $(PREFERABLY_POSIX_SHELL)
-SUBDIRS = virshdata confdata sexpr2xmldata \
- xml2sexprdata xmconfigdata xencapsdata
+SUBDIRS = virshdata confdata
+
+if ENABLE_XEN_TESTS
+SUBDIRS += sexpr2xmldata xml2sexprdata xmconfigdata xencapsdata
+endif
INCLUDES = \
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
@@ -43,10 +46,14 @@ EXTRA_DIST = \
nodeinfodata \
domainschematest
-noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \
- reconnect xmconfigtest xencapstest \
+noinst_PROGRAMS = xmlrpctest virshtest conftest \
nodeinfotest statstest qparamtest
+if ENABLE_XEN_TESTS
+noinst_PROGRAMS += xml2sexprtest sexpr2xmltest reconnect xmconfigtest \
+ xencapstest
+endif
+
if WITH_QEMU
noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest
endif
@@ -66,11 +73,10 @@ endif
EXTRA_DIST += $(test_scripts)
-TESTS = xml2sexprtest sexpr2xmltest virshtest xmconfigtest \
- xencapstest nodeinfotest \
+TESTS = virshtest nodeinfotest \
statstest qparamtest $(test_scripts)
if ENABLE_XEN_TESTS
- TESTS += reconnect
+ TESTS += reconnect xml2sexprtest sexpr2xmltest xmconfigtest xencapstest
endif
if WITH_QEMU
TESTS += qemuxml2argvtest qemuxml2xmltest
@@ -103,6 +109,7 @@ xmlrpctest_SOURCES = \
xmlrpctest_LDADD = $(LDADDS)
+if ENABLE_XEN_TESTS
xml2sexprtest_SOURCES = \
xml2sexprtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@@ -117,6 +124,10 @@ xmconfigtest_SOURCES = \
xmconfigtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
xmconfigtest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
+else
+EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
+ testutilsxen.c testutilsxen.h
+endif
if WITH_QEMU
qemuxml2argvtest_SOURCES = \
@@ -141,9 +152,13 @@ conftest_SOURCES = \
conftest.c
conftest_LDADD = $(LDADDS)
+if ENABLE_XEN_TESTS
xencapstest_SOURCES = \
xencapstest.c testutils.h testutils.c
xencapstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
+else
+EXTRA_DIST += xencapstest.c
+endif
nodeinfotest_SOURCES = \
nodeinfotest.c testutils.h testutils.c
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list