From: Alexander Kanavin <[email protected]> This reverts commit 617a0eb86219bb183202503e4f79c08030661f85.
This was merged in master, assuming that SDL UI frontend would be disabled next, to allow update to qemu 11.x where that fronted has a regression. Now that it was decided we should try and fix (or help fix) the actual issue in that frontend [1], keeping this change would effectively disable testing of the Gtk+ UI frontend (which is not enabled by default), which is an undesirable regression in testing. [1] https://lists.openembedded.org/g/openembedded-architecture/message/2393 Signed-off-by: Alexander Kanavin <[email protected]> --- meta/lib/oeqa/selftest/cases/runtime_test.py | 32 +++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index d332dac707..a3c3126036 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -249,29 +249,25 @@ TEST_RUNQEMUPARAMS += " slirp" qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') features = 'IMAGE_CLASSES += "testimage"\n' - - if 'gtk+' not in qemu_packageconfig and 'sdl' not in qemu_packageconfig: - self.skipTest("Neither gtk+ nor sdl enabled in qemu-system-native; the test requires at least one") - + if 'gtk+' not in qemu_packageconfig: + features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n' + if 'sdl' not in qemu_packageconfig: + features += 'PACKAGECONFIG:append:pn-qemu-system-native = " sdl"\n' if 'opengl' not in qemu_distrofeatures: features += 'DISTRO_FEATURES:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' - - if 'gtk+' in qemu_packageconfig: - features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' - self.write_config(features_gtk) - with mock.patch.dict(os.environ, {"DISPLAY": display}): - bitbake('core-image-minimal') - bitbake('-c testimage core-image-minimal') - - if 'sdl' in qemu_packageconfig: - features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' - self.write_config(features_sdl) - with mock.patch.dict(os.environ, {"DISPLAY": display}): - bitbake('core-image-minimal') - bitbake('-c testimage core-image-minimal') + features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' + self.write_config(features_gtk) + with mock.patch.dict(os.environ, {"DISPLAY": display}): + bitbake('core-image-minimal') + bitbake('-c testimage core-image-minimal') + features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' + self.write_config(features_sdl) + with mock.patch.dict(os.environ, {"DISPLAY": display}): + bitbake('core-image-minimal') + bitbake('-c testimage core-image-minimal') @skipIfNotMachine("qemux86-64", "test needs qemux86-64") def test_testimage_virgl_headless(self): -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#238320): https://lists.openembedded.org/g/openembedded-core/message/238320 Mute This Topic: https://lists.openembedded.org/mt/119736566/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
