From c21c38d71b31f0b119d615cc16800eee9fe0bb10 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 6 May 2013 10:21:55 -0600 Subject: [PATCH] build: clean up stray files found by 'make distcheck' 'make distcheck' complained: ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log Problems introduced in commits f015495 and 25ea8e4 (both v1.0.3). * tests/commandtest.c (test21): Check (and clean) log file. * tests/commanddata/test21.log: New file. * python/Makefile.am (CLEANFILES): Clean up compiled python files. Signed-off-by: Eric Blake --- python/Makefile.am | 3 ++- tests/commanddata/test21.log | 12 ++++++++++++ tests/commandtest.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/commanddata/test21.log diff --git a/python/Makefile.am b/python/Makefile.am index ba444ef02b..767d807a2a 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -142,7 +142,8 @@ uninstall-local: rm -f $(DESTDIR)$(pyexecdir)/libvirt_lxc.py rm -f $(DESTDIR)$(pyexecdir)/libvirt_qemu.py -CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp +CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \ + *.pyc else all: diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log new file mode 100644 index 0000000000..1b59206352 --- /dev/null +++ b/tests/commanddata/test21.log @@ -0,0 +1,12 @@ +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=testTMPDIR=/tmp +ENV:PATH=/usr/bin:/bin +ENV:USER=test +FD:0 +FD:1 +FD:2 +DAEMON:no +CWD:/tmp diff --git a/tests/commandtest.c b/tests/commandtest.c index 6cb88c5072..68398aca33 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -891,7 +891,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - ret = 0; + ret = checkoutput("test21"); cleanup: VIR_FREE(outbuf); VIR_FREE(errbuf); -- GitLab