提交 2a5ccbef 编写于 作者: E Eric Blake

build: distribute commandtest files

* tests/Makefile.am (SUBDIRS): Add commanddata.
* tests/commandtest.c (checkoutput): Delete correct file.
(test4): Delete pid file.
(mymain): Delete unused variable.
* tests/commanddata/Makefile.am: New file.
* configure.ac (AC_OUTPUT): Build new makefile.
Reported by Dominik Klein.
上级 e8e9397c
......@@ -2254,6 +2254,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/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 \
......
......@@ -2,7 +2,7 @@
SHELL = $(PREFERABLY_POSIX_SHELL)
SUBDIRS = confdata sexpr2xmldata \
SUBDIRS = commanddata confdata sexpr2xmldata \
xml2sexprdata xmconfigdata xencapsdata
INCLUDES = \
......
EXTRA_DIST = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log))
......@@ -86,7 +86,7 @@ static int checkoutput(const char *testname)
ret = 0;
cleanup:
unlink(actuallog);
unlink(actualname);
VIR_FREE(actuallog);
VIR_FREE(actualname);
VIR_FREE(expectlog);
......@@ -248,6 +248,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED)
cleanup:
virCommandFree(cmd);
unlink(pidfile);
VIR_FREE(pidfile);
return ret;
}
......@@ -707,12 +708,6 @@ mymain(int argc, char **argv)
1, NAME, NULL) < 0) \
ret = -1
char *actualname;
if (virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir) < 0)
return EXIT_FAILURE;
unlink(actualname);
VIR_FREE(actualname);
DO_TEST(test0);
DO_TEST(test1);
DO_TEST(test2);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册