Mesa (master): ci: Make the skip list regexes match the full test name.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7f52df7fc9bbfcd862320be8fbab4b82649aadf3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f52df7fc9bbfcd862320be8fbab4b82649aadf3

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov  5 09:50:40 2019 -0800

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 at intel.com>
Acked-by: Daniel Stone <daniels at collabora.com>
Acked-by: Michel Dänzer <mdaenzer at redhat.com>

---

 .gitlab-ci/deqp-default-skips.txt        | 6 +++---
 .gitlab-ci/deqp-freedreno-a630-skips.txt | 8 ++++----
 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