build: fix autobuild failures on gcov upgrade

Last time I ran ./autobuild.sh was on F13; and upgrading to F14
exposed these leftovers due to a newer gcov than what was in the stale
files, in the form of spurious messages that break 'make check':

+profiling:/home/remote/eblake/libvirt-tmp/tools/virsh-console.gcda:Version mismatch - expected 405R got 404R

and concluding with a bug in the autobuild.sh script itself:

./autobuild.sh: line 44: test: =: unary operator expected

* autobuild.sh: avoid syntax error on failed test
* tools/Makefile.am (CLEANFILES): Clean coverage files.

diff --git a/autobuild.sh b/autobuild.sh
index 130f72d4193d8a5180d6f730b3d6d86460a8257b..8248a5954e6779980eb3626d8155a606e5b31bc7 100755 (executable)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -41,7 +41,7 @@ st=$(
   { make check syntax-check 2>&1; echo $? >&4; } | tee "$RESULTS"
 )
 exec 3>&-
-test $st = 0
+test "$st" = 0
 test -x /usr/bin/lcov && make cov
 
 rm -f *.tar.gz

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 376ffa81916034a80c9cab0c97ce0ef90cb7bcc0..8a5fb5285f16ea36719b4ae60d03ba7a75085a4a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -160,5 +160,6 @@ endif # LIBVIRT_INIT_SCRIPT_RED_HAT
 
 
 CLEANFILES = $(bin_SCRIPTS) $(man1_MANS)
+CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
 
 DISTCLEANFILES = $(BUILT_SOURCES)