[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] tests: Handle changing QEMUDIR



qemu-wrapper isn't regenerated if QEMUDIR is changed, so just
delete it and force regeneration.

Additionally we can drop the silent binary check, since
check-with-upstream-qemu-1 already does a similar test with --version
that will actually report an error to the user.
---
 Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 42052c0..6e5e30a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,9 +357,8 @@ QEMUDIR = $(HOME)/d/qemu
 QEMUBINARY = $(QEMUDIR)/x86_64-softmmu/qemu-system-x86_64
 
 check-with-upstream-qemu:
-	@if $(QEMUBINARY) --help >/dev/null 2>&1; then \
-	  $(MAKE) check-with-upstream-qemu-1 || exit $$?; \
-	fi
+	rm -f $(top_builddir)/qemu-wrapper.sh
+	$(MAKE) check-with-upstream-qemu-1 || exit $$?
 
 check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh
 	$(QEMUBINARY) --version
-- 
1.8.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]