|
@@ -188,18 +188,14 @@ class TestImage(OESelftestTestCase):
|
|
|
self.skipTest('virgl isn\'t working with Opensuse 15.0')
|
|
|
|
|
|
qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
|
|
|
- sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
|
|
|
+ qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
|
|
|
features = 'INHERIT += "testimage"\n'
|
|
|
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 'virglrenderer' not in qemu_packageconfig:
|
|
|
- features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
|
|
|
- if 'glx' not in qemu_packageconfig:
|
|
|
- features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
|
|
|
- if 'opengl' not in sdl_packageconfig:
|
|
|
- features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\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'
|
|
@@ -231,12 +227,10 @@ class TestImage(OESelftestTestCase):
|
|
|
dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True)
|
|
|
except subprocess.CalledProcessError as e:
|
|
|
self.skipTest("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.")
|
|
|
- qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
|
|
|
+ qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
|
|
|
features = 'INHERIT += "testimage"\n'
|
|
|
- if 'virglrenderer' not in qemu_packageconfig:
|
|
|
- features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
|
|
|
- if 'glx' not in qemu_packageconfig:
|
|
|
- features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\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'
|