summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDit Kozmaj <dit.kozmaj@kynetics.com>2023-04-06 10:44:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-13 11:56:07 +0100
commita60925d00aefd144c25f5a6d86949d42d802f181 (patch)
tree4ef976e53e8570aa4bbf5ada5cc33aadbc16740b
parent18b04f9c3fd6d4268da538c7622875f02ff59d64 (diff)
downloadpoky-a60925d00aefd144c25f5a6d86949d42d802f181.tar.gz
selftest: wic: Add test for --part-name argument
Add test for wic --part-name argument in .wks file. Test three different cases: - Set only the --part-name argument. - Set only the --label argument. In this case the GPT partition label is set to the value of --label for compatibility reasons. - Set both. In this case the code has been changed to set the GPT partition label to the --part-name value. The test uses a test_gpt_partition_name.wks file created for this purpose. (From OE-Core rev: 06af6795cf6f079362303bddb39a14459e228e72) Signed-off-by: Dit Kozmaj <dit.kozmaj@kynetics.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/wic/test_gpt_partition_name.wks7
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py23
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-selftest/wic/test_gpt_partition_name.wks b/meta-selftest/wic/test_gpt_partition_name.wks
new file mode 100644
index 0000000000..7db6da9aee
--- /dev/null
+++ b/meta-selftest/wic/test_gpt_partition_name.wks
@@ -0,0 +1,7 @@
1# short-description: image to test part-name in GPT partitions
2
3part --fstype=ext4 --part-name boot-A --label boot --size 1M --align 1024
4part / --source rootfs --fstype=ext4 --part-name root-A --align 1024
5part --fstype=ext4 --label ext-space --size 1M --align 1024
6
7bootloader --ptable gpt
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index b26b649c3a..0b0ca90c1e 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1348,6 +1348,29 @@ class Wic2(WicTestCase):
1348 if os.path.exists(image_path + '.bak'): 1348 if os.path.exists(image_path + '.bak'):
1349 os.rename(image_path + '.bak', image_path) 1349 os.rename(image_path + '.bak', image_path)
1350 1350
1351 def test_gpt_partition_name(self):
1352 """Test --part-name argument to set partition name in GPT table"""
1353 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "test_gpt_partition_name.wks"\n'
1354 self.append_config(config)
1355 bitbake('core-image-minimal')
1356 self.remove_config(config)
1357 deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE')
1358 machine = self.td['MACHINE']
1359
1360 image_path = os.path.join(deploy_dir, 'core-image-minimal-%s.wic' % machine)
1361 # Image is created
1362 self.assertTrue(os.path.exists(image_path))
1363
1364 # Check the names of the three partitions
1365 # as listed in test_gpt_partition_name.wks
1366 result = runCmd("sfdisk --part-label %s 1" % image_path)
1367 self.assertEqual('boot-A', result.output)
1368 result = runCmd("sfdisk --part-label %s 2" % image_path)
1369 self.assertEqual('root-A', result.output)
1370 # When the --part-name is not defined, the partition name is equal to the --label
1371 result = runCmd("sfdisk --part-label %s 3" % image_path)
1372 self.assertEqual('ext-space', result.output)
1373
1351class ModifyTests(WicTestCase): 1374class ModifyTests(WicTestCase):
1352 def test_wic_ls(self): 1375 def test_wic_ls(self):
1353 """Test listing image content using 'wic ls'""" 1376 """Test listing image content using 'wic ls'"""