diff options
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-test-install.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/piglit/glslparser+quick_shader.txt | 5 | ||||
| -rw-r--r-- | .gitlab-ci/piglit/quick_gl.txt | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/.gitlab-ci/debian-test-install.sh b/.gitlab-ci/debian-test-install.sh index 59dcbbd064b..bb48c470922 100644 --- a/.gitlab-ci/debian-test-install.sh +++ b/.gitlab-ci/debian-test-install.sh @@ -57,7 +57,7 @@ apt-get install -y --no-remove \ git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 7a92b02210dabbba31ae5fd71272ea742346a9c8 +git checkout 594edcc00d55028d4c815f6192ba9885b2340eb6 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ninja -j4 diff --git a/.gitlab-ci/piglit/glslparser+quick_shader.txt b/.gitlab-ci/piglit/glslparser+quick_shader.txt index eb4e62eb3da..7e0ed1d584b 100644 --- a/.gitlab-ci/piglit/glslparser+quick_shader.txt +++ b/.gitlab-ci/piglit/glslparser+quick_shader.txt @@ -615,6 +615,7 @@ spec/arb_geometry_shader4/preprocessor/enabled-core_vert: skip spec/arb_get_program_binary/execution/uniform-after-restore: skip spec/arb_gl_spirv/execution: skip spec/arb_gl_spirv/execution/uniform: skip +spec/arb_gl_spirv/execution/xfb: skip spec/arb_gl_spirv/linker/uniform: skip spec/arb_gpu_shader5/compiler/builtin-functions/fs-gather-comp-float-samplers_frag: skip spec/arb_gpu_shader5/compiler/builtin-functions/fs-gather-comp-int-samplers_frag: skip @@ -5335,7 +5336,7 @@ summary: pass: 9617 fail: 7 crash: 1 - skip: 5323 + skip: 5324 timeout: 0 warn: 0 incomplete: 0 @@ -5344,4 +5345,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 14948 + total: 14949 diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index 3555aad02e4..274f2bd5d09 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -897,6 +897,7 @@ spec/ati_envmap_bumpmap/ati_envmap_bumpmap-bump: skip spec/egl 1_4/egl-blob-cache: skip spec/egl 1_4/egl-context-priority: skip spec/egl 1_4/egl-copy-buffers: fail +spec/egl 1_4/egl-flush-external: skip spec/egl 1_4/egl-gl_oes_egl_image: skip spec/egl 1_4/egl-invalid-attr: skip spec/egl 1_4/eglcreatepbuffersurface with egl_samples set: skip @@ -1776,7 +1777,7 @@ summary: pass: 4503 fail: 101 crash: 2 - skip: 1667 + skip: 1668 timeout: 0 warn: 2 incomplete: 0 @@ -1785,4 +1786,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 6275 + total: 6276 |