ci: Fix DEQP_CASELIST_FILTER (used by a630 noubo run)

We were doing sed -i /filter/p, which printed everything but printed the
filtered things twice (though they'd only get tested once).  Now that the
filter works, run all the UBO tests instead of doing a 1/5 run, revealing
new failures.

(cherry picked from commit 90cf494338,
commit message and UBO fail list updated since we don't have the UBO
fixes in)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5548>
This commit is contained in:
Eric Anholt 2020-05-15 17:18:12 -07:00 committed by Eric Engestrom
parent c707d26202
commit 84e0fd6b1c
3 changed files with 64 additions and 2 deletions

View file

@ -821,7 +821,7 @@ arm64_a630_gles31_options:
script:
# We almost always manage to lower UBOs back to constant uploads in
# the test suite, so get a little testing for it here.
- DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_EXPECTED_FAILS=deqp-freedreno-a630-noubo-fails.txt DEQP_CASELIST_FILTER="functional.\*ubo" ./install/deqp-runner.sh
- DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" DEQP_EXPECTED_FAILS=deqp-freedreno-a630-noubo-fails.txt CI_NODE_INDEX= ./install/deqp-runner.sh
# The driver does some guessing as to whether to render using gmem
# or bypass, and some GLES3.1 features interact with either one.
# Do a little testing with gmem and bypass forced.

View file

@ -1,18 +1,80 @@
dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear
dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.0
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.11
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.12
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.15
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.16
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.18
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.19
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.21
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.23
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.24
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.27
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.28
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.29
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.3
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.31
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.35
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.37
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.39
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.40
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.43
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.44
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.45
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.48
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.5
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.6
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.7
dEQP-GLES31.functional.ubo.random.all_per_block_buffers.8
dEQP-GLES31.functional.ubo.random.all_shared_buffer.0
dEQP-GLES31.functional.ubo.random.all_shared_buffer.12
dEQP-GLES31.functional.ubo.random.all_shared_buffer.14
dEQP-GLES31.functional.ubo.random.all_shared_buffer.16
dEQP-GLES31.functional.ubo.random.all_shared_buffer.17
dEQP-GLES31.functional.ubo.random.all_shared_buffer.18
dEQP-GLES31.functional.ubo.random.all_shared_buffer.2
dEQP-GLES31.functional.ubo.random.all_shared_buffer.20
dEQP-GLES31.functional.ubo.random.all_shared_buffer.21
dEQP-GLES31.functional.ubo.random.all_shared_buffer.23
dEQP-GLES31.functional.ubo.random.all_shared_buffer.24
dEQP-GLES31.functional.ubo.random.all_shared_buffer.25
dEQP-GLES31.functional.ubo.random.all_shared_buffer.27
dEQP-GLES31.functional.ubo.random.all_shared_buffer.29
dEQP-GLES31.functional.ubo.random.all_shared_buffer.3
dEQP-GLES31.functional.ubo.random.all_shared_buffer.31
dEQP-GLES31.functional.ubo.random.all_shared_buffer.35
dEQP-GLES31.functional.ubo.random.all_shared_buffer.37
dEQP-GLES31.functional.ubo.random.all_shared_buffer.4
dEQP-GLES31.functional.ubo.random.all_shared_buffer.40
dEQP-GLES31.functional.ubo.random.all_shared_buffer.43
dEQP-GLES31.functional.ubo.random.all_shared_buffer.45
dEQP-GLES31.functional.ubo.random.all_shared_buffer.46
dEQP-GLES31.functional.ubo.random.all_shared_buffer.47
dEQP-GLES31.functional.ubo.random.all_shared_buffer.48
dEQP-GLES31.functional.ubo.random.all_shared_buffer.5
dEQP-GLES31.functional.ubo.random.all_shared_buffer.6
dEQP-GLES31.functional.ubo.random.all_shared_buffer.9
dEQP-GLES31.functional.ubo.random.basic_type_arrays.0
dEQP-GLES31.functional.ubo.random.basic_type_arrays.1
dEQP-GLES31.functional.ubo.random.basic_type_arrays.10
dEQP-GLES31.functional.ubo.random.basic_type_arrays.11
dEQP-GLES31.functional.ubo.random.basic_type_arrays.12
dEQP-GLES31.functional.ubo.random.basic_type_arrays.13
dEQP-GLES31.functional.ubo.random.basic_type_arrays.15
dEQP-GLES31.functional.ubo.random.basic_type_arrays.16
dEQP-GLES31.functional.ubo.random.basic_type_arrays.18
dEQP-GLES31.functional.ubo.random.basic_type_arrays.19
dEQP-GLES31.functional.ubo.random.basic_type_arrays.20
dEQP-GLES31.functional.ubo.random.basic_type_arrays.21
dEQP-GLES31.functional.ubo.random.basic_type_arrays.22
dEQP-GLES31.functional.ubo.random.basic_type_arrays.23
dEQP-GLES31.functional.ubo.random.basic_type_arrays.24
dEQP-GLES31.functional.ubo.random.basic_type_arrays.3
dEQP-GLES31.functional.ubo.random.basic_type_arrays.4
dEQP-GLES31.functional.ubo.random.basic_type_arrays.5
dEQP-GLES31.functional.ubo.random.basic_type_arrays.6
dEQP-GLES31.functional.ubo.random.basic_type_arrays.7
dEQP-GLES31.functional.ubo.random.basic_type_arrays.8
dEQP-GLES31.functional.ubo.random.basic_type_arrays.9

View file

@ -61,7 +61,7 @@ if [ -n "$CI_NODE_INDEX" ]; then
fi
if [ -n "$DEQP_CASELIST_FILTER" ]; then
sed -i "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
sed -ni "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
fi
if [ ! -s /tmp/case-list.txt ]; then