From: Eric Anholt Date: Tue, 5 Nov 2019 17:50:40 +0000 (-0800) Subject: ci: Make the skip list regexes match the full test name. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f52df7fc9bbfcd862320be8fbab4b82649aadf3;p=mesa.git ci: Make the skip list regexes match the full test name. The bash scripts were using grep in the manner that matches any subset of the line, but the new CTS runner matches the whole line and I think that's a pretty good behavior. Given that some of the skip lists already were written to match the full test name, just make them consistently do so. Reviewed-by: Eric Engestrom Acked-by: Daniel Stone Acked-by: Michel Dänzer --- diff --git a/.gitlab-ci/deqp-default-skips.txt b/.gitlab-ci/deqp-default-skips.txt index 70dc0cb5737..f7d0cd59a90 100644 --- a/.gitlab-ci/deqp-default-skips.txt +++ b/.gitlab-ci/deqp-default-skips.txt @@ -3,8 +3,8 @@ # delete lines from the test list. Be careful. # Skip the perf/stress tests to keep runtime manageable -dEQP-GLES[0-9]*.performance -dEQP-GLES[0-9]*.stress +dEQP-GLES[0-9]*.performance.* +dEQP-GLES[0-9]*.stress.* # These are really slow on tiling architectures (including llvmpipe). -dEQP-GLES[0-9]*.functional.flush_finish +dEQP-GLES[0-9]*.functional.flush_finish.* diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/.gitlab-ci/deqp-freedreno-a630-skips.txt index 7af4387fa49..65d340c3687 100644 --- a/.gitlab-ci/deqp-freedreno-a630-skips.txt +++ b/.gitlab-ci/deqp-freedreno-a630-skips.txt @@ -3,17 +3,17 @@ # delete lines from the test list. Be careful. # Skip the perf/stress tests to keep runtime manageable -dEQP-GLES[0-9]*.performance -dEQP-GLES[0-9]*.stress +dEQP-GLES[0-9]*.performance.* +dEQP-GLES[0-9]*.stress.* # These are really slow on tiling architectures (including llvmpipe). -dEQP-GLES[0-9]*.functional.flush_finish +dEQP-GLES[0-9]*.functional.flush_finish.* # Unstable test results dEQP-GLES3.functional.fragment_out.random.* dEQP-GLES3.functional.transform_feedback.* dEQP-GLES31.functional.primitive_bounding_box.* -dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array +dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array.* # Seen a couple flakes on this one. Note that valgrind complains about # some things in deqp reference renderer on this one. Not sure if that