summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2019-11-05 09:50:40 -0800
committerEric Anholt <eric@anholt.net>2019-11-12 12:54:04 -0800
commit7f52df7fc9bbfcd862320be8fbab4b82649aadf3 (patch)
treedf19734012007ada96f1164f4b6e11e657aaed12 /.gitlab-ci
parent66719e02420dc267b740f7c2ffeb335013fcfce5 (diff)
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 <eric.engestrom@intel.com> Acked-by: Daniel Stone <daniels@collabora.com> Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/deqp-default-skips.txt6
-rw-r--r--.gitlab-ci/deqp-freedreno-a630-skips.txt8
2 files changed, 7 insertions, 7 deletions
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