[Qemu-devel] [PATCH for-2.4] tests: Fix broken targets check-report-qtest-*

[Qemu-devel] [PATCH for-2.4] tests: Fix broken targets check-report-qtest-*

[Stefan Weil]

They need QTEST_QEMU_IMG. Without it, the tests raise an assertion:

$ make -C bin check-report-qtest-i386.xml
make: Entering directory 'bin'
GTESTER check-report-qtest-i386.xml
blkdebug: Suspended request 'A'
blkdebug: Resuming request 'A'
ahci-test: tests/libqos/libqos.c:162:
 mkimg: Assertion `qemu_img_path' failed.
main-loop: WARNING: I/O thread spun for 1000 iterations

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 tests/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Makefile b/tests/Makefile
index 2c4b8dc..8d26736 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -478,6 +478,7 @@ $(patsubst %, check-%, $(check-unit-y)): check-%: %
 
 $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y)
 	$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
+		QTEST_QEMU_IMG=qemu-img$(EXESUF) \
 	  gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")
 
 check-report-unit.xml: $(check-unit-y)
-- 
2.1.4

Re: [Qemu-devel] [PATCH for-2.4] tests: Fix broken targets check-report-qtest-*

[John Snow]

On 07/18/2015 10:54 AM, Stefan Weil wrote:
> They need QTEST_QEMU_IMG. Without it, the tests raise an assertion:
> 
> $ make -C bin check-report-qtest-i386.xml
> make: Entering directory 'bin'
> GTESTER check-report-qtest-i386.xml
> blkdebug: Suspended request 'A'
> blkdebug: Resuming request 'A'
> ahci-test: tests/libqos/libqos.c:162:
>  mkimg: Assertion `qemu_img_path' failed.
> main-loop: WARNING: I/O thread spun for 1000 iterations
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  tests/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 2c4b8dc..8d26736 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -478,6 +478,7 @@ $(patsubst %, check-%, $(check-unit-y)): check-%: %
>  
>  $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y)
>  	$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> +		QTEST_QEMU_IMG=qemu-img$(EXESUF) \
>  	  gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")
>  
>  check-report-unit.xml: $(check-unit-y)
> 

My apologies -- missed a spot when I added this.
I'll stage this one in my IDE branch if nobody feels it belongs in a
different tree.

Reviewed-by: John Snow <jsnow@redhat.com>

Re: [Qemu-devel] [PATCH for-2.4] tests: Fix broken targets check-report-qtest-*

[John Snow]

On 07/18/2015 10:54 AM, Stefan Weil wrote:
> They need QTEST_QEMU_IMG. Without it, the tests raise an assertion:
> 
> $ make -C bin check-report-qtest-i386.xml
> make: Entering directory 'bin'
> GTESTER check-report-qtest-i386.xml
> blkdebug: Suspended request 'A'
> blkdebug: Resuming request 'A'
> ahci-test: tests/libqos/libqos.c:162:
>  mkimg: Assertion `qemu_img_path' failed.
> main-loop: WARNING: I/O thread spun for 1000 iterations
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  tests/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 2c4b8dc..8d26736 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -478,6 +478,7 @@ $(patsubst %, check-%, $(check-unit-y)): check-%: %
>  
>  $(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y)
>  	$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
> +		QTEST_QEMU_IMG=qemu-img$(EXESUF) \
>  	  gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")
>  
>  check-report-unit.xml: $(check-unit-y)
> 

Tentatively:

Thanks, applied to my IDE tree:

https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git

--js