提交 65532f45 编写于 作者: E Eric Blake

maint: improve tests distribution

* 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.
上级 a0db66cf
...@@ -2251,12 +2251,6 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ ...@@ -2251,12 +2251,6 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
daemon/Makefile \ daemon/Makefile \
tools/Makefile \ tools/Makefile \
tests/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/apparmor/Makefile \
examples/domain-events/events-c/Makefile \ examples/domain-events/events-c/Makefile \
examples/domsuspend/Makefile \ examples/domsuspend/Makefile \
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
SHELL = $(PREFERABLY_POSIX_SHELL) SHELL = $(PREFERABLY_POSIX_SHELL)
SUBDIRS = commanddata confdata sexpr2xmldata \
xml2sexprdata xmconfigdata xencapsdata
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
...@@ -39,38 +36,44 @@ LDADDS = \ ...@@ -39,38 +36,44 @@ LDADDS = \
$(COVERAGE_LDFLAGS) $(COVERAGE_LDFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
oomtrace.pl \
test-lib.sh \
qemuxml2argvdata \
qemuxml2xmloutdata \
nodeinfodata \
schematestutils.sh \
capabilityschematest \
capabilityschemadata \ capabilityschemadata \
networkschematest \ capabilityschematest \
networkxml2xmlout \ commanddata \
networkxml2xmlin \ confdata \
domainschematest \ cputestdata \
domainschemadata \ domainschemadata \
domainschematest \
domainsnapshotschematest \
domainsnapshotxml2xmlin \
domainsnapshotxml2xmlout \
interfaceschemadata \ interfaceschemadata \
networkschematest \
networkxml2xmlin \
networkxml2xmlout \
nodedevschemadata \
nodedevschematest \
nodeinfodata \
nwfilterschematest \
nwfilterxml2xmlin \
nwfilterxml2xmlout \
oomtrace.pl \
qemuhelpdata \
qemuxml2argvdata \
qemuxml2xmloutdata \
schematestutils.sh \
sexpr2xmldata \
storagepoolschematest \ storagepoolschematest \
storagepoolxml2xmlout \
storagepoolxml2xmlin \ storagepoolxml2xmlin \
storagepoolxml2xmlout \
storagevolschematest \ storagevolschematest \
storagevolxml2xmlout \
storagevolxml2xmlin \ storagevolxml2xmlin \
nodedevschematest \ storagevolxml2xmlout \
nodedevschemadata \ test-lib.sh \
vmx2xmldata \ vmx2xmldata \
xml2vmxdata \ xencapsdata \
nwfilterxml2xmlout \ xmconfigdata \
nwfilterxml2xmlin \ xml2sexprdata \
nwfilterschematest \ xml2vmxdata
domainsnapshotschematest \
domainsnapshotxml2xmlout \
domainsnapshotxml2xmlin \
qemuhelpdata \
cputestdata
check_PROGRAMS = virshtest conftest sockettest \ check_PROGRAMS = virshtest conftest sockettest \
nodeinfotest qparamtest virbuftest \ nodeinfotest qparamtest virbuftest \
......
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log))
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf))
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard \
$(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps))
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg))
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册