diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 32b74469d8..11dc7442b3 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
| @@ -181,6 +181,10 @@ class Wic(oeSelfTest): | |||
| 181 | @testcase(1560) | 181 | @testcase(1560) |
| 182 | def test_systemd_bootdisk(self): | 182 | def test_systemd_bootdisk(self): |
| 183 | """Test creation of systemd-bootdisk image""" | 183 | """Test creation of systemd-bootdisk image""" |
| 184 | config = 'IMAGE_FSTYPES += " hddimg "\nMACHINE_FEATURES_append = " efi"\n' | ||
| 185 | self.append_config(config) | ||
| 186 | bitbake('core-image-minimal') | ||
| 187 | self.remove_config(config) | ||
| 184 | cmd = "wic create systemd-bootdisk -e core-image-minimal" | 188 | cmd = "wic create systemd-bootdisk -e core-image-minimal" |
| 185 | self.assertEqual(0, runCmd(cmd).status) | 189 | self.assertEqual(0, runCmd(cmd).status) |
| 186 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) | 190 | self.assertEqual(1, len(glob(self.resultdir + "systemd-bootdisk-*direct"))) |
| @@ -379,7 +383,11 @@ class Wic(oeSelfTest): | |||
| 379 | @testcase(1351) | 383 | @testcase(1351) |
| 380 | def test_wic_image_type(self): | 384 | def test_wic_image_type(self): |
| 381 | """Test building wic images by bitbake""" | 385 | """Test building wic images by bitbake""" |
| 386 | config = 'IMAGE_FSTYPES += " hddimg wic"\nWKS_FILE = "wic-image-minimal"\n'\ | ||
| 387 | 'MACHINE_FEATURES_append = " efi"\n' | ||
| 388 | self.append_config(config) | ||
| 382 | self.assertEqual(0, bitbake('wic-image-minimal').status) | 389 | self.assertEqual(0, bitbake('wic-image-minimal').status) |
| 390 | self.remove_config(config) | ||
| 383 | 391 | ||
| 384 | deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE') | 392 | deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE') |
| 385 | machine = get_bb_var('MACHINE') | 393 | machine = get_bb_var('MACHINE') |
| @@ -394,7 +402,11 @@ class Wic(oeSelfTest): | |||
| 394 | @testcase(1422) | 402 | @testcase(1422) |
| 395 | def test_qemu(self): | 403 | def test_qemu(self): |
| 396 | """Test wic-image-minimal under qemu""" | 404 | """Test wic-image-minimal under qemu""" |
| 405 | config = 'IMAGE_FSTYPES += " hddimg wic"\nWKS_FILE = "wic-image-minimal"\n'\ | ||
| 406 | 'MACHINE_FEATURES_append = " efi"\n' | ||
| 407 | self.append_config(config) | ||
| 397 | self.assertEqual(0, bitbake('wic-image-minimal').status) | 408 | self.assertEqual(0, bitbake('wic-image-minimal').status) |
| 409 | self.remove_config(config) | ||
| 398 | 410 | ||
| 399 | with runqemu('wic-image-minimal', ssh=False) as qemu: | 411 | with runqemu('wic-image-minimal', ssh=False) as qemu: |
| 400 | cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" | 412 | cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" |
