summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2020-01-21 15:23:39 -0800
committerMarge Bot <eric+marge@anholt.net>2020-01-22 00:53:48 +0000
commit17c9ec94f59e9823018e2b219fe154e0d78056ca (patch)
tree5ef55a0d12eea34ba0f4bdd0757aa0a73a85a217
parent68cfc65ccbca748f0dfdc85876b9b5c02e598c11 (diff)
downloadmesa-17c9ec94f59e9823018e2b219fe154e0d78056ca.tar.gz
gitlab-ci: Skip ext_timer_query/time-elapsed
This test's result is unpredictable, so it may occasionally pass when we expect it to fail, thus causing the CI pipeline to fail. Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3498> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3498>
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--.gitlab-ci/piglit/quick_gl.txt5
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1272d537123..cd53f02cbe0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -555,6 +555,7 @@ piglit-quick_gl:
-x arb_gpu_shader5
-x egl_ext_device_
-x egl_ext_platform_device
+ -x ext_timer_query@time-elapsed
-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 71b2bf168a6..51c2cbd68fe 100644
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -2012,7 +2012,6 @@ spec/ext_texture_srgb/multisample-formats 32 gl_ext_texture_srgb: skip
spec/ext_texture_srgb/multisample-formats 4 gl_ext_texture_srgb: skip
spec/ext_texture_srgb/multisample-formats 6 gl_ext_texture_srgb: skip
spec/ext_texture_srgb/multisample-formats 8 gl_ext_texture_srgb: skip
-spec/ext_timer_query/time-elapsed: fail
spec/ext_transform_feedback/tessellation quad_strip flat_first: warn
spec/ext_transform_feedback/tessellation quads flat_first: warn
spec/ext_window_rectangles/dlist/call: skip
@@ -2208,7 +2207,7 @@ summary:
name: results
---- --------
pass: 19319
- fail: 236
+ fail: 235
crash: 2
skip: 1948
timeout: 0
@@ -2219,4 +2218,4 @@ summary:
changes: 0
fixes: 0
regressions: 0
- total: 21525
+ total: 21524