Libguestfs - Dec 2012 - [PATCH v3] tests: Fix qemu-wrapper.sh generation

---
v3:
    s/top_builddir/abs_top_builddir/

 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2eebefa..1c91859 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,11 +352,11 @@ check-with-upstream-qemu:
 
 check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh
 	$(QEMUBINARY) --version
-	$(MAKE) LIBGUESTFS_QEMU=$(top_builddir)/qemu-wrapper.sh check
+	$(MAKE) LIBGUESTFS_QEMU=$(abs_top_builddir)/qemu-wrapper.sh check
 
 $(top_builddir)/qemu-wrapper.sh: Makefile
 	rm -f $@ $@-t
-	echo exec "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios"
"$$@" > $@-t
+	echo -e "#!/bin/sh\nexec" "$(QEMUBINARY)" -L
"$(QEMUDIR)/pc-bios" \"\$$@\" > $@-t
 	chmod +x,-w $@-t
 	mv $@-t $@
 
-- 
1.8.0.1

On Sat, Dec 08, 2012 at 08:51:07PM -0500, Cole Robinson
wrote:
> ---
> v3:
>     s/top_builddir/abs_top_builddir/
> 
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 2eebefa..1c91859 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -352,11 +352,11 @@ check-with-upstream-qemu:
>  
>  check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh
>  	$(QEMUBINARY) --version
> -	$(MAKE) LIBGUESTFS_QEMU=$(top_builddir)/qemu-wrapper.sh check
> +	$(MAKE) LIBGUESTFS_QEMU=$(abs_top_builddir)/qemu-wrapper.sh check
>  
>  $(top_builddir)/qemu-wrapper.sh: Makefile
>  	rm -f $@ $@-t
> -	echo exec "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios"
"$$@" > $@-t
> +	echo -e "#!/bin/sh\nexec" "$(QEMUBINARY)" -L
"$(QEMUDIR)/pc-bios" \"\$$@\" > $@-t
>  	chmod +x,-w $@-t
>  	mv $@-t $@
>  
> -- 
> 1.8.0.1
Thanks Cole, I have pushed this.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v