From 3097efe5f0a70a38f5e7fbd34add8649282139bf Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 4 Dec 2019 16:13:38 -0800 Subject: [PATCH] ci: Disable egl_ext_device_drm tests in piglit. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If the runner has a HW device that would be supported, even without /dev/dri forwarded into the container, it will be enumerated and the tests on llvmpipe fail with (for example): libEGL warning: Not allowed to force software rendering when API explicitly selects a hardware device. libEGL warning: MESA-LOADER: failed to open i965 (search paths /builds/anholt/mesa/install/lib/dri) Given that we can't necessarily control the DRI devices present on the runners (particularly for developers bringing their own runners to reduce the demands on fd.o's shared resources), just skip these tests in CI. Reviewed-by: Michel Dänzer --- .gitlab-ci.yml | 2 ++ .gitlab-ci/piglit/quick_gl.txt | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c85f5dbe566..0c89ec45a2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -491,6 +491,8 @@ piglit-quick_gl: PIGLIT_OPTIONS: > --process-isolation false -x arb_gpu_shader5 + -x egl_ext_device_ + -x egl_ext_platform_device -x glx-multithread-clearbuffer -x glx-multithread-shader-compile -x max-texture-size diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index f724c069bf6..0100f409344 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -1399,12 +1399,7 @@ spec/egl_android_native_fence_sync/egl_khr_fence_sync android_native/eglgetsynca spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_msc_and_sbc_test: skip spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_null_pointers: skip spec/egl_chromium_sync_control/conformance/eglgetsyncvalueschromium_ust_test: skip -spec/egl_ext_device_drm/conformance: skip spec/egl_ext_image_dma_buf_import_modifiers/conformance: skip -spec/egl_ext_platform_device/conformance/create_pbuffer: skip -spec/egl_ext_platform_device/conformance/create_pixmap: skip -spec/egl_ext_platform_device/conformance/create_window: skip -spec/egl_ext_platform_device/conformance/initialize_display: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_with_display_bound_in_other_thread: skip spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: skip spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail @@ -2290,10 +2285,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 17787 + pass: 17782 fail: 235 crash: 2 - skip: 2032 + skip: 2027 timeout: 0 warn: 2 incomplete: 0 @@ -2302,4 +2297,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 20076 + total: 20066 -- 2.30.2