| Message ID | 1446604018-14025-5-git-send-email-tubo@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 04.11.2015 03:26, Bo Tu wrote: > Ever since qemu-iotest 120 was introduced, its expected output didn't > include the output from the built-in VNC server: > > QA output created by 120 > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > QMP_VERSION > +VNC server running on `::1:5900' > {"return": {}} > wrote 65536/65536 bytes at offset 0 > 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > Since some architectures do not even have a graphical console, we just > pass -nographic to avoid the output. > > Fixes: a68197ff5b11 ("iotests: Add tests for overriding > BDRV_O_PROTOCOL") > > Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com> > --- > tests/qemu-iotests/120 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 > index 9f13078..fb69efd 100755 > --- a/tests/qemu-iotests/120 > +++ b/tests/qemu-iotests/120 > @@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'} > {'execute': 'human-monitor-command', > 'arguments': {'command-line': 'qemu-io drv \"write -P 42 0 64k\"'}} > {'execute': 'quit'}" \ > - | $QEMU -qmp stdio -nodefaults \ > + | $QEMU -qmp stdio -nodefaults -nographic \ > -drive id=drv,if=none,file="$TEST_IMG",driver=raw,file.driver=$IMGFMT \ > | _filter_qmp | _filter_qemu_io > $QEMU_IO -c 'read -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io Looks good, but I think we need the same for 119. Max
Hi Max: On 11/19/2015 12:56 AM, Max Reitz wrote: > On 04.11.2015 03:26, Bo Tu wrote: >> Ever since qemu-iotest 120 was introduced, its expected output didn't >> include the output from the built-in VNC server: >> >> QA output created by 120 >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 >> QMP_VERSION >> +VNC server running on `::1:5900' >> {"return": {}} >> wrote 65536/65536 bytes at offset 0 >> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> >> Since some architectures do not even have a graphical console, we just >> pass -nographic to avoid the output. >> >> Fixes: a68197ff5b11 ("iotests: Add tests for overriding >> BDRV_O_PROTOCOL") >> >> Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com> >> Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com> >> --- >> tests/qemu-iotests/120 | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 >> index 9f13078..fb69efd 100755 >> --- a/tests/qemu-iotests/120 >> +++ b/tests/qemu-iotests/120 >> @@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'} >> {'execute': 'human-monitor-command', >> 'arguments': {'command-line': 'qemu-io drv \"write -P 42 0 64k\"'}} >> {'execute': 'quit'}" \ >> - | $QEMU -qmp stdio -nodefaults \ >> + | $QEMU -qmp stdio -nodefaults -nographic \ >> -drive id=drv,if=none,file="$TEST_IMG",driver=raw,file.driver=$IMGFMT \ >> | _filter_qmp | _filter_qemu_io >> $QEMU_IO -c 'read -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io > > Looks good, but I think we need the same for 119. I agree with you that 119 need to add the parameter of "-nographic" at line 53. 52 | $QEMU -drive id=drv,if=none,file="$TEST_IMG",driver=nbd \ 53 -qmp stdio -nodefaults \ > > Max >
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index 9f13078..fb69efd 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'} {'execute': 'human-monitor-command', 'arguments': {'command-line': 'qemu-io drv \"write -P 42 0 64k\"'}} {'execute': 'quit'}" \ - | $QEMU -qmp stdio -nodefaults \ + | $QEMU -qmp stdio -nodefaults -nographic \ -drive id=drv,if=none,file="$TEST_IMG",driver=raw,file.driver=$IMGFMT \ | _filter_qmp | _filter_qemu_io $QEMU_IO -c 'read -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io
Ever since qemu-iotest 120 was introduced, its expected output didn't include the output from the built-in VNC server: QA output created by 120 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 QMP_VERSION +VNC server running on `::1:5900' {"return": {}} wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Since some architectures do not even have a graphical console, we just pass -nographic to avoid the output. Fixes: a68197ff5b11 ("iotests: Add tests for overriding BDRV_O_PROTOCOL") Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com> --- tests/qemu-iotests/120 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)