[OE-core] [PATCH 6/6] runqemu: do not rely on grepping images

[Ed Bartosh]

Hi,

This patch breaks wic test_qemu test case. The reason is that it runs qemu with
-drive if=none command line option. Changing it to -drive if=virtio should fix the issue.

stty: standard input: Inappropriate ioctl for device
runqemu - INFO - Running /bin/ip link...
runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap0.lock...
runqemu - INFO - Using preconfigured tap device tap0
runqemu - INFO - If this is not intended, touch
/tmp/qemu-tap-locks/tap0.skip to make runqemu skip tap0.
runqemu - INFO - Network configuration:
192.168.7.2::192.168.7.1:255.255.255.0
runqemu - INFO - Using scsi drive
runqemu - INFO - Running ldd
/home/ed/git/yocto/poky/build/tmp/work/qemux86_64-poky-linux/wic-image-minimal/1.0-r0/recipe-sysroot-native/usr/bin/qemu-system-x86_64...
runqemu - INFO - Running
/home/ed/git/yocto/poky/build/tmp/work/qemux86_64-poky-linux/wic-image-minimal/1.0-r0/recipe-sysroot-native/usr/bin/qemu-system-x86_64
-device virtio-net-pci,netdev=net0,mac=52:54:00:12:34:02 -netdev
tap,id=net0,ifname=tap0,script=no,downscript=no -drive
if=none,id=hd,file=/home/ed/git/yocto/poky/build/tmp/deploy/images/qemux86-64/wic-image-minimal-qemux86-64.wic,format=raw
-device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd -no-reboot -vga
vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci
-nographic -serial tcp:127.0.0.1:38144  -cpu core2duo -m 256 -serial
tcp:127.0.0.1:33992 -snapshot 
QEMU 2.8.0 monitor - type 'help' for more information
(qemu) 
Waiting at most 1000 seconds for login banner
Connection from 127.0.0.1:51177
Reached login banner
Logged as root in serial console
Stopping logging thread
Stop event received
Tearing down logging thread
Sending SIGTERM to runqemu
FAIL

======================================================================
FAIL: test_qemu (oeqa.selftest.wic.Wic)
Test wic-image-minimal under qemu
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ed/git/yocto/poky/meta/lib/oeqa/utils/decorators.py", line
109, in wrapped_f
    return func(*args, **kwargs)
  File "/home/ed/git/yocto/poky/meta/lib/oeqa/selftest/wic.py", line 57,
in wrapped_f
    return func(*args, **kwargs)
  File "/home/ed/git/yocto/poky/meta/lib/oeqa/selftest/wic.py", line
613, in test_qemu
    self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt')
AssertionError: '/dev/root /' != '/dev/root /\r\n/dev/vda3 /mnt'
- /dev/root /
+ /dev/root /
/dev/vda3 /mnt


----------------------------------------------------------------------
Ran 1 test in 179.193s

--
Regards,
Ed