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 <eblake@redhat.com>

diff --git a/python/Makefile.am b/python/Makefile.am
index ba444ef02b51ef8c2333de5f483dc2b56cd06f1b..767d807a2a698d4deb39912f046afefc2b257a82 100644 (file)
--- 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 (file)
index 0000000..1b59206
--- /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 6cb88c5072ff3e5b91a87aeada84b2e7edd0cb42..68398aca336a27a86f9a7c73b55a359048c749b0 100644 (file)
--- 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);