Previously, runqemu grep root=/dev/sd or root=/dev/hd on the image, and
would use vda if no grep result, now we have set QB_DRIVE_TYPE to
"/dev/sd" by default, and the device will be /dev/sda, so use sda to
replace vda in the test case.
Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
meta/lib/oeqa/selftest/wic.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 8030c35117..34de6808c4 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -613,7 +613,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4
--exclude-path bin/ --r
cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '"
status, output = qemu.run_serial(cmd)
self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
- self.assertEqual(output, '/dev/root /\r\n/dev/vda3 /mnt')
+ self.assertEqual(output, '/dev/root /\r\n/dev/sda3 /mnt')
@only_for_arch(['i586', 'i686', 'x86_64'])
def test_qemu_efi(self):
@@ -625,7 +625,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4
--exclude-path bin/ --r
with runqemu('core-image-minimal', ssh=False,
runqemuparams='ovmf', image_fstype='wic') as qemu:
- cmd = "grep vda. /proc/partitions |wc -l"
+ cmd = "grep sda. /proc/partitions |wc -l"
status, output = qemu.run_serial(cmd)
self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
self.assertEqual(output, '3')
@@ -700,7 +700,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4
--exclude-path bin/ --r
self.remove_config(config)
with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as
qemu:
- cmd = "grep vda. /proc/partitions |wc -l"
+ cmd = "grep sda. /proc/partitions |wc -l"
status, output = qemu.run_serial(cmd)
self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
self.assertEqual(output, '2')
--
2.11.0.rc2.dirty
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
