* tests/Makefile.am (EXTRA_DIST): Sort, and add directories.
(SUBDIRS): Drop automake recursion into subdirs.
* tests/commanddata/Makefile.am: Delete.
* tests/confdata/Makefile.am: Likewise.
* tests/sexpr2xmldata/Makefile.am: Likewise.
* tests/xencapsdata/Makefile.am: Likewise.
* tests/xmconfigdata/Makefile.am: Likewise.
* tests/xml2sexprdata/Makefile.am: Likewise.
---
This deletes more than it adds; the worst part of the diff is that I
mixed sorting with addition. Let me know if you want those actions
split into two pieces for easier review.
configure.ac | 6 ----
tests/Makefile.am | 57 ++++++++++++++++++++------------------
tests/commanddata/Makefile.am | 2 -
tests/confdata/Makefile.am | 2 -
tests/sexpr2xmldata/Makefile.am | 2 -
tests/xencapsdata/Makefile.am | 3 --
tests/xmconfigdata/Makefile.am | 2 -
tests/xml2sexprdata/Makefile.am | 2 -
8 files changed, 30 insertions(+), 46 deletions(-)
delete mode 100644 tests/commanddata/Makefile.am
delete mode 100644 tests/confdata/Makefile.am
delete mode 100644 tests/sexpr2xmldata/Makefile.am
delete mode 100644 tests/xencapsdata/Makefile.am
delete mode 100644 tests/xmconfigdata/Makefile.am
delete mode 100644 tests/xml2sexprdata/Makefile.am
diff --git a/configure.ac b/configure.ac
index 64e76dc..a52a03c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2251,12 +2251,6 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
daemon/Makefile \
tools/Makefile \
tests/Makefile \
- tests/xml2sexprdata/Makefile \
- tests/sexpr2xmldata/Makefile \
- tests/xmconfigdata/Makefile \
- tests/xencapsdata/Makefile \
- tests/confdata/Makefile \
- tests/commanddata/Makefile \
examples/apparmor/Makefile \
examples/domain-events/events-c/Makefile \
examples/domsuspend/Makefile \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a235cf..de2ff91 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,6 @@
SHELL = $(PREFERABLY_POSIX_SHELL)
-SUBDIRS = commanddata confdata sexpr2xmldata \
- xml2sexprdata xmconfigdata xencapsdata
-
INCLUDES = \
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
-I$(top_builddir)/include \
@@ -39,38 +36,44 @@ LDADDS = \
$(COVERAGE_LDFLAGS)
EXTRA_DIST = \
- oomtrace.pl \
- test-lib.sh \
- qemuxml2argvdata \
- qemuxml2xmloutdata \
- nodeinfodata \
- schematestutils.sh \
- capabilityschematest \
capabilityschemadata \
- networkschematest \
- networkxml2xmlout \
- networkxml2xmlin \
- domainschematest \
+ capabilityschematest \
+ commanddata \
+ confdata \
+ cputestdata \
domainschemadata \
+ domainschematest \
+ domainsnapshotschematest \
+ domainsnapshotxml2xmlin \
+ domainsnapshotxml2xmlout \
interfaceschemadata \
+ networkschematest \
+ networkxml2xmlin \
+ networkxml2xmlout \
+ nodedevschemadata \
+ nodedevschematest \
+ nodeinfodata \
+ nwfilterschematest \
+ nwfilterxml2xmlin \
+ nwfilterxml2xmlout \
+ oomtrace.pl \
+ qemuhelpdata \
+ qemuxml2argvdata \
+ qemuxml2xmloutdata \
+ schematestutils.sh \
+ sexpr2xmldata \
storagepoolschematest \
- storagepoolxml2xmlout \
storagepoolxml2xmlin \
+ storagepoolxml2xmlout \
storagevolschematest \
- storagevolxml2xmlout \
storagevolxml2xmlin \
- nodedevschematest \
- nodedevschemadata \
+ storagevolxml2xmlout \
+ test-lib.sh \
vmx2xmldata \
- xml2vmxdata \
- nwfilterxml2xmlout \
- nwfilterxml2xmlin \
- nwfilterschematest \
- domainsnapshotschematest \
- domainsnapshotxml2xmlout \
- domainsnapshotxml2xmlin \
- qemuhelpdata \
- cputestdata
+ xencapsdata \
+ xmconfigdata \
+ xml2sexprdata \
+ xml2vmxdata
check_PROGRAMS = virshtest conftest sockettest \
nodeinfotest qparamtest virbuftest \
diff --git a/tests/commanddata/Makefile.am b/tests/commanddata/Makefile.am
deleted file mode 100644
index ea0f8e1..0000000
--- a/tests/commanddata/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log))
diff --git a/tests/confdata/Makefile.am b/tests/confdata/Makefile.am
deleted file mode 100644
index eaaadbc..0000000
--- a/tests/confdata/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf))
diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am
deleted file mode 100644
index db43109..0000000
--- a/tests/sexpr2xmldata/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))
diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am
deleted file mode 100644
index ed08bc4..0000000
--- a/tests/xencapsdata/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard \
- $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps))
diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am
deleted file mode 100644
index af0cb09..0000000
--- a/tests/xmconfigdata/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg))
diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am
deleted file mode 100644
index 20028bb..0000000
--- a/tests/xml2sexprdata/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))
--
1.7.3.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list