From 74b90ae3c226295a6ff196b71273983da3e1a70e Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Wed, 14 Sep 2022 10:20:47 -0700 Subject: tests: Skip trapezoids for unsupported XRender formats xserver commit 436fd7e8b4966c305ea9c43f3c14c2ca04c35539 removed support for PictStandardA4. x11perf assumes this format always exists, so trying to run the -aa4trap* tests causes a segmentation fault when `XRenderFindStandardFormat (xp->d, PictStandardA4)` returns NULL. Since the server change was intentional, skip the tests if XRenderFindStandardFormat() returns NULL. See also: https://gitlab.freedesktop.org/xorg/xserver/-/commit/436fd7e8b4966c305ea9c43f3c14c2ca04c35539 --- do_traps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/do_traps.c b/do_traps.c index 0fd7056..0f5d168 100644 --- a/do_traps.c +++ b/do_traps.c @@ -165,6 +165,8 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps) break; } maskFormat = XRenderFindStandardFormat (xp->d, std_fmt); + if (!maskFormat) + return 0; maskPixmap = XCreatePixmap (xp->d, xp->w, WIDTH, HEIGHT, depth); -- cgit v1.2.3