From 38afe8f5ec6f2b3ce917c70b7df3d25c33c7168a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 17 Nov 2010 10:38:59 -0700 Subject: [PATCH] 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. --- autobuild.sh | 2 +- tools/Makefile.am | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/autobuild.sh b/autobuild.sh index 130f72d419..8248a5954e 100755 --- 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 376ffa8191..8a5fb5285f 100644 --- 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)