diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 | ||||
-rwxr-xr-x | scripts/runqemu | 21 |
2 files changed, 15 insertions, 8 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 20969d2c48..3f212bd0ea 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -191,7 +191,7 @@ class TestImage(OESelftestTestCase): | |||
191 | features += 'TEST_SUITES = "ping ssh virgl"\n' | 191 | features += 'TEST_SUITES = "ping ssh virgl"\n' |
192 | features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n' | 192 | features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n' |
193 | features += 'IMAGE_INSTALL_append = " kmscube"\n' | 193 | features += 'IMAGE_INSTALL_append = " kmscube"\n' |
194 | features += 'TEST_RUNQEMUPARAMS = "gtk-gl"\n' | 194 | features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n' |
195 | self.write_config(features) | 195 | self.write_config(features) |
196 | bitbake('core-image-minimal') | 196 | bitbake('core-image-minimal') |
197 | bitbake('-c testimage core-image-minimal') | 197 | bitbake('-c testimage core-image-minimal') |
diff --git a/scripts/runqemu b/scripts/runqemu index 4415e9b69f..68ba7dcfb9 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -65,9 +65,10 @@ of the following environment variables (in any order): | |||
65 | MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) | 65 | MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) |
66 | Simplified QEMU command-line options can be passed with: | 66 | Simplified QEMU command-line options can be passed with: |
67 | nographic - disable video console | 67 | nographic - disable video console |
68 | sdl - choose the SDL frontend instead of the Gtk+ default | 68 | sdl - choose the SDL UI frontend |
69 | gtk-gl - enable virgl-based GL acceleration using Gtk+ frontend | 69 | gtk - choose the Gtk UI frontend |
70 | gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk+ frontend | 70 | gl - enable virgl-based GL acceleration (also needs gtk option) |
71 | gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk option) | ||
71 | egl-headless - enable headless EGL output; use vnc or spice to see it | 72 | egl-headless - enable headless EGL output; use vnc or spice to see it |
72 | serial - enable a serial console on /dev/ttyS0 | 73 | serial - enable a serial console on /dev/ttyS0 |
73 | serialstdio - enable a serial console on the console (regardless of graphics mode) | 74 | serialstdio - enable a serial console on the console (regardless of graphics mode) |
@@ -436,10 +437,16 @@ class BaseConfig(object): | |||
436 | self.kernel_cmdline_script += ' console=ttyS0' | 437 | self.kernel_cmdline_script += ' console=ttyS0' |
437 | elif arg == 'sdl': | 438 | elif arg == 'sdl': |
438 | self.qemu_opt_script += ' -display sdl' | 439 | self.qemu_opt_script += ' -display sdl' |
439 | elif arg == 'gtk-gl': | 440 | elif arg == 'gtk': |
440 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' | 441 | if 'gl' in sys.argv[1:]: |
441 | elif arg == 'gtk-gl-es': | 442 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' |
442 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' | 443 | elif 'gl-es' in sys.argv[1:]: |
444 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' | ||
445 | else: | ||
446 | self.qemu_opt_script += ' -display gtk' | ||
447 | elif arg == 'gl' or arg == 'gl-es': | ||
448 | # These args are handled inside sdl or gtk blocks above | ||
449 | pass | ||
443 | elif arg == 'egl-headless': | 450 | elif arg == 'egl-headless': |
444 | self.qemu_opt_script += ' -vga virtio -display egl-headless' | 451 | self.qemu_opt_script += ' -vga virtio -display egl-headless' |
445 | # As runqemu can be run within bitbake (when using testimage, for example), | 452 | # As runqemu can be run within bitbake (when using testimage, for example), |