Thanks, applied as 2ad762d196aff095f016fe13df86709ae428ed08. Michael
[sent from post-receive hook] On Tue, 19 Mar 2024 07:44:53 +0100, Philipp Zabel <p.za...@pengutronix.de> wrote: > * Enable Vulkan tests. > * Disable find_package(Git) to stop tests/llvmpipe/CMakeLists.gl.txt > from trying (and failing) to determine the git hash from an extracted > source tarball. > > Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> > Message-Id: <20240314154608.1015145-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/piglit.in b/rules/piglit.in > index 397585c5d26b..72cd20e8983a 100644 > --- a/rules/piglit.in > +++ b/rules/piglit.in > @@ -24,6 +24,8 @@ menuconfig PIGLIT > select XORG if PIGLIT_TESTS_OPENGL > select MESALIB_GLES1 if PIGLIT_TESTS_OPENGLES1 > select MESALIB_GLES2 if PIGLIT_TESTS_OPENGLES2 || PIGLIT_TESTS_OPENGLES3 > + select VULKAN_LOADER if PIGLIT_TESTS_VULKAN > + select VKRUNNER if PIGLIT_TESTS_VULKAN && RUNTIME > help > Piglit is the opensource OpenGL/OpenCL test suite. > > @@ -51,4 +53,8 @@ config PIGLIT_TESTS_OPENGLES3 > bool > prompt "build OpenGL ES3 tests" > > +config PIGLIT_TESTS_VULKAN > + bool > + prompt "build Vulkan tests" > + > endif > diff --git a/rules/piglit.make b/rules/piglit.make > index 626522d6ac9c..a84216567b7f 100644 > --- a/rules/piglit.make > +++ b/rules/piglit.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIGLIT) += piglit > # > # Paths and names > # > -PIGLIT_VERSION := 2021-11-17-g2f80c7cc9c02 > -PIGLIT_MD5 := c1975f4f0ff2eb2c37e30af1da87d8a9 > +PIGLIT_VERSION := 2024-03-09-gb32186ee5313 > +PIGLIT_MD5 := 404aec6973480d5ac54588c01f0c8fd4 > PIGLIT := piglit-$(PIGLIT_VERSION) > PIGLIT_SUFFIX := tar.gz > PIGLIT_URL := > https://gitlab.freedesktop.org/mesa/piglit/-/archive/$(PIGLIT_VERSION)/$(PIGLIT).$(PIGLIT_SUFFIX) > @@ -32,6 +32,7 @@ PIGLIT_CONF_TOOL := cmake > > PIGLIT_CONF_OPT := $(CROSS_CMAKE_USR) \ > -G Ninja \ > + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \ > -DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \ > -DPIGLIT_USE_WAFFLE=1 \ > -DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, > PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \ > @@ -39,6 +40,7 @@ PIGLIT_CONF_OPT := $(CROSS_CMAKE_USR) \ > -DPIGLIT_BUILD_GLES2_TESTS=$(call ptx/ifdef, > PTXCONF_PIGLIT_TESTS_OPENGLES2,1,0) \ > -DPIGLIT_BUILD_GLES3_TESTS=$(call ptx/ifdef, > PTXCONF_PIGLIT_TESTS_OPENGLES3,1,0) \ > -DPIGLIT_BUILD_CL_TESTS=0 \ > + -DPIGLIT_BUILD_VK_TESTS=$(call ptx/ifdef, > PTXCONF_PIGLIT_TESTS_VULKAN,1,0) \ > -DHAVE_LIBCACA:BOOL=NO > > PIGLIT_MAKE_ENV := \
