diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-04-23 20:02:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-27 15:11:47 +0100 |
commit | 06413d33b30b7a058f20f065eb8c095070708fca (patch) | |
tree | 1fedf493e195e9a5203a394a40b12315e4d12430 /meta/lib | |
parent | 377a73d5b72b7c2c400519d9dc8e4b2fcd1348ac (diff) | |
download | poky-06413d33b30b7a058f20f065eb8c095070708fca.tar.gz |
oeqa/selftest: transition to weston images
For readonly rootfs tests core-image-weston
is appended; everywhere else it replaces core-image-sato.
(From OE-Core rev: 75e042db853b9bf9a70ff8a5abe6d45ebb0b77a9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/buildoptions.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/imagefeatures.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 10 |
5 files changed, 12 insertions, 14 deletions
diff --git a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py index f7c356ad09..7ac03f0cec 100644 --- a/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py +++ b/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | |||
@@ -90,7 +90,7 @@ class RebuildFromSState(SStateBase): | |||
90 | self.assertFalse(failed_cleansstate, msg="The following recipes have failed cleansstate(all others have passed both cleansstate and rebuild from sstate tests): %s" % ' '.join(map(str, failed_cleansstate))) | 90 | self.assertFalse(failed_cleansstate, msg="The following recipes have failed cleansstate(all others have passed both cleansstate and rebuild from sstate tests): %s" % ' '.join(map(str, failed_cleansstate))) |
91 | 91 | ||
92 | def test_sstate_relocation(self): | 92 | def test_sstate_relocation(self): |
93 | self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=True, rebuild_dependencies=True) | 93 | self.run_test_sstate_rebuild(['core-image-weston-sdk'], relocate=True, rebuild_dependencies=True) |
94 | 94 | ||
95 | def test_sstate_rebuild(self): | 95 | def test_sstate_rebuild(self): |
96 | self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=False, rebuild_dependencies=True) | 96 | self.run_test_sstate_rebuild(['core-image-weston-sdk'], relocate=False, rebuild_dependencies=True) |
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py index 1859d3222a..754b77defd 100644 --- a/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/meta/lib/oeqa/selftest/cases/buildoptions.py | |||
@@ -50,9 +50,9 @@ class ImageOptionsTests(OESelftestTestCase): | |||
50 | def test_read_only_image(self): | 50 | def test_read_only_image(self): |
51 | distro_features = get_bb_var('DISTRO_FEATURES') | 51 | distro_features = get_bb_var('DISTRO_FEATURES') |
52 | if not ('x11' in distro_features and 'opengl' in distro_features): | 52 | if not ('x11' in distro_features and 'opengl' in distro_features): |
53 | self.skipTest('core-image-sato requires x11 and opengl in distro features') | 53 | self.skipTest('core-image-sato/weston requires x11 and opengl in distro features') |
54 | self.write_config('IMAGE_FEATURES += "read-only-rootfs"') | 54 | self.write_config('IMAGE_FEATURES += "read-only-rootfs"') |
55 | bitbake("core-image-sato") | 55 | bitbake("core-image-sato core-image-weston") |
56 | # do_image will fail if there are any pending postinsts | 56 | # do_image will fail if there are any pending postinsts |
57 | 57 | ||
58 | class DiskMonTest(OESelftestTestCase): | 58 | class DiskMonTest(OESelftestTestCase): |
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 6723a8198f..5d4330b48f 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py | |||
@@ -240,8 +240,8 @@ USERADD_GID_TABLES += "files/static-group" | |||
240 | 240 | ||
241 | def test_no_busybox_base_utils(self): | 241 | def test_no_busybox_base_utils(self): |
242 | config = """ | 242 | config = """ |
243 | # Enable x11 | 243 | # Enable wayland |
244 | DISTRO_FEATURES_append += "x11" | 244 | DISTRO_FEATURES_append += "pam opengl wayland" |
245 | 245 | ||
246 | # Switch to systemd | 246 | # Switch to systemd |
247 | DISTRO_FEATURES += "systemd" | 247 | DISTRO_FEATURES += "systemd" |
@@ -262,7 +262,7 @@ PNBLACKLIST[busybox] = "Don't build this" | |||
262 | """ | 262 | """ |
263 | self.write_config(config) | 263 | self.write_config(config) |
264 | 264 | ||
265 | bitbake("--graphviz core-image-sato") | 265 | bitbake("--graphviz core-image-weston") |
266 | 266 | ||
267 | def test_image_gen_debugfs(self): | 267 | def test_image_gen_debugfs(self): |
268 | """ | 268 | """ |
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index b20c5b427b..84c2cb77e8 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -128,7 +128,6 @@ class TestImage(OESelftestTestCase): | |||
128 | features += 'TEST_SUITES = "ping ssh selftest"\n' | 128 | features += 'TEST_SUITES = "ping ssh selftest"\n' |
129 | self.write_config(features) | 129 | self.write_config(features) |
130 | 130 | ||
131 | # Build core-image-sato and testimage | ||
132 | bitbake('core-image-full-cmdline socat') | 131 | bitbake('core-image-full-cmdline socat') |
133 | bitbake('-c testimage core-image-full-cmdline') | 132 | bitbake('-c testimage core-image-full-cmdline') |
134 | 133 | ||
@@ -164,7 +163,6 @@ class TestImage(OESelftestTestCase): | |||
164 | features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home | 163 | features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home |
165 | self.write_config(features) | 164 | self.write_config(features) |
166 | 165 | ||
167 | # Build core-image-sato and testimage | ||
168 | bitbake('core-image-full-cmdline socat') | 166 | bitbake('core-image-full-cmdline socat') |
169 | bitbake('-c testimage core-image-full-cmdline') | 167 | bitbake('-c testimage core-image-full-cmdline') |
170 | 168 | ||
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index c46e8ba489..9db2a0bb44 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -261,7 +261,7 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb" | |||
261 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 261 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
262 | """) | 262 | """) |
263 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 263 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
264 | bitbake("core-image-sato -S none") | 264 | bitbake("core-image-weston -S none") |
265 | self.write_config(""" | 265 | self.write_config(""" |
266 | MACHINE = "qemux86" | 266 | MACHINE = "qemux86" |
267 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" | 267 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" |
@@ -273,12 +273,12 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb" | |||
273 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 273 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
274 | """) | 274 | """) |
275 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 275 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
276 | bitbake("core-image-sato -S none") | 276 | bitbake("core-image-weston -S none") |
277 | 277 | ||
278 | def get_files(d): | 278 | def get_files(d): |
279 | f = [] | 279 | f = [] |
280 | for root, dirs, files in os.walk(d): | 280 | for root, dirs, files in os.walk(d): |
281 | if "core-image-sato" in root: | 281 | if "core-image-weston" in root: |
282 | # SDKMACHINE changing will change | 282 | # SDKMACHINE changing will change |
283 | # do_rootfs/do_testimage/do_build stamps of images which | 283 | # do_rootfs/do_testimage/do_build stamps of images which |
284 | # is safe to ignore. | 284 | # is safe to ignore. |
@@ -306,7 +306,7 @@ NATIVELSBSTRING = \"DistroA\" | |||
306 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 306 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
307 | """) | 307 | """) |
308 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 308 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
309 | bitbake("core-image-sato -S none") | 309 | bitbake("core-image-weston -S none") |
310 | self.write_config(""" | 310 | self.write_config(""" |
311 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 311 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
312 | TCLIBCAPPEND = \"\" | 312 | TCLIBCAPPEND = \"\" |
@@ -314,7 +314,7 @@ NATIVELSBSTRING = \"DistroB\" | |||
314 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 314 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
315 | """) | 315 | """) |
316 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 316 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
317 | bitbake("core-image-sato -S none") | 317 | bitbake("core-image-weston -S none") |
318 | 318 | ||
319 | def get_files(d): | 319 | def get_files(d): |
320 | f = [] | 320 | f = [] |