piglit: add conditional config to point at deqp bins
PATCH v2 1/1 piglit: add conditional config to point at deqp bins
From: Randolph Sapp <[email protected]>
Add a PACKAGECONFIG to define runtime dependencies on deqp tests and conditionally set values for the default config so piglit works out of the box.
Adjust the arago.conf accordingly. Drop the explicit requirements for individual cts tests in ti-test-extras.
Signed-off-by Randolph Sapp <[email protected]>
--- meta-arago-distro/conf/distro/arago.conf | 6 +++- .../recipes-core/packagegroups/ti-test.bb | 2 -- .../recipes-graphics/piglit/piglit_%.bbappend | 30 +++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/piglit/piglit_%.bbappend
meta-arago-distro/conf/distro/arago.conf +5 -1
@@ -99,7 +99,11 @@ PACKAGECONFIG:pn-glmark2 = "drm-gles2 wayland-gles2" PACKAGECONFIG:pn-weston-init = "" # Enable testing for opencl and vulkan with piglit -PACKAGECONFIG:append:pn-piglit = " ${@bb.utils.filter("DISTRO_FEATURES", "opencl vulkan", d)}" +PACKAGECONFIG:append:pn-piglit = " \ + ${@bb.utils.filter("DISTRO_FEATURES", "opencl vulkan", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "deqp-gles", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "deqp-vk", "", d)} \ +" PACKAGECONFIG:pn-opengl-es-cts = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "surfaceless", d)}" PACKAGECONFIG:pn-vulkan-cts = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "surfaceless", d)}"
meta-arago-distro/recipes-core/packagegroups/ti-test.bb +0 -2
@@ -43,8 +43,6 @@ ARAGO_TEST = "\ ARAGO_TEST_EXTRAS = " \ python3-numpy \ piglit \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan-cts", "", d)} \ " ARAGO_TEST:append:armv7a = " \
meta-arago-distro/recipes-graphics/piglit/piglit_%.bbappend new file +30 -0
@@ -0,0 +1,30 @@ +# add a config to point piglit at the default install location for deqp tests +# if they are selected + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG[deqp-gles] = ",,,opengl-es-cts" +PACKAGECONFIG[deqp-vk] = ",,,vulkan-cts" + +do_install:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'deqp-gles', 'true', 'false', d)}; then + printf "%s\n" \ + "[deqp-egl]" \ + "bin=/usr/lib/opengl-es-cts/deqp-egl" \ + "[deqp-gles2]" \ + "bin=/usr/lib/opengl-es-cts/deqp-gles2" \ + "[deqp-gles3]" \ + "bin=/usr/lib/opengl-es-cts/deqp-gles3" \ + "[deqp-gles31]" \ + "bin=/usr/lib/opengl-es-cts/deqp-gles31" \ + >> ${D}/${libdir}/piglit/piglit.conf + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'deqp-vk', 'true', 'false', d)}; then + printf "%s\n" \ + "[deqp-vk]" \ + "bin=/usr/lib/vulkan-cts/deqp-vk" \ + "[deqp-vksc]" \ + "bin=/usr/lib/vulkan-cts/deqp-vksc" \ + >> ${D}/${libdir}/piglit/piglit.conf + fi +}
Signature · 1 line
2.41.0