summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-11-09 19:31:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-11 13:43:40 +0000
commit92c1e7300f5a8570fc2dfc2797e7010080e4583d (patch)
tree86eb303bd424bc2385f145ec1fde5c6bf0333dc4 /meta/lib
parent3cb2640ad5e0717671351c8dc4f0da2e27c0882c (diff)
downloadpoky-92c1e7300f5a8570fc2dfc2797e7010080e4583d.tar.gz
oeqa/selftest/overlayfs: overlayfs: skip x86-specific tests
For now, not all machines have a default wks file, so mark the tests which need a wks as being specific to qemux86-64. (From OE-Core rev: 152f1a8cdf698b71c956e9910911dcb141a1f5be) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/overlayfs.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py
index 57a8c8bdb6..dfd9f1486d 100644
--- a/meta/lib/oeqa/selftest/cases/overlayfs.py
+++ b/meta/lib/oeqa/selftest/cases/overlayfs.py
@@ -7,6 +7,7 @@
7from oeqa.selftest.case import OESelftestTestCase 7from oeqa.selftest.case import OESelftestTestCase
8from oeqa.utils.commands import bitbake, runqemu 8from oeqa.utils.commands import bitbake, runqemu
9from oeqa.core.decorator import OETestTag 9from oeqa.core.decorator import OETestTag
10from oeqa.core.decorator.data import skipIfNotMachine
10 11
11def getline_qemu(out, line): 12def getline_qemu(out, line):
12 for l in out.split('\n'): 13 for l in out.split('\n'):
@@ -333,6 +334,8 @@ EXTRA_IMAGE_FEATURES += "package-management"
333 self.assertTrue("overlayfs-etc" in res.output, msg=res.output) 334 self.assertTrue("overlayfs-etc" in res.output, msg=res.output)
334 self.assertTrue("package-management" in res.output, msg=res.output) 335 self.assertTrue("package-management" in res.output, msg=res.output)
335 336
337 # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14963
338 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently")
336 def test_image_feature_is_missing(self): 339 def test_image_feature_is_missing(self):
337 """ 340 """
338 Summary: Overlayfs-etc class is not applied when image feature is not set 341 Summary: Overlayfs-etc class is not applied when image feature is not set
@@ -368,9 +371,11 @@ OVERLAYFS_ETC_DEVICE = "/dev/sda3"
368 line = getline_qemu(output, "upperdir=/data/overlay-etc/upper") 371 line = getline_qemu(output, "upperdir=/data/overlay-etc/upper")
369 self.assertFalse(line, msg=output) 372 self.assertFalse(line, msg=output)
370 373
374 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently")
371 def test_sbin_init_preinit(self): 375 def test_sbin_init_preinit(self):
372 self.run_sbin_init(False) 376 self.run_sbin_init(False)
373 377
378 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently")
374 def test_sbin_init_original(self): 379 def test_sbin_init_original(self):
375 self.run_sbin_init(True) 380 self.run_sbin_init(True)
376 381
@@ -419,6 +424,7 @@ OVERLAYFS_ETC_DEVICE = "/dev/sda3"
419 line = getline_qemu(output, testFile) 424 line = getline_qemu(output, testFile)
420 self.assertTrue(line and line.startswith(testFile), msg=output) 425 self.assertTrue(line and line.startswith(testFile), msg=output)
421 426
427 @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently")
422 def test_lower_layer_access(self): 428 def test_lower_layer_access(self):
423 """ 429 """
424 Summary: Test that lower layer of /etc is available read-only when configured 430 Summary: Test that lower layer of /etc is available read-only when configured