From: Eric Anholt <eric@anholt.net>
Date: Sat, 16 May 2020 00:18:12 +0000 (-0700)
Subject: ci: Fix DEQP_CASELIST_FILTER (used by a630 noubo run)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90cf494338512bde89717600efabc4135545216e;p=mesa.git

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
a new failure.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5089>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17bb3c7afaa..981d306b3c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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_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.
diff --git a/.gitlab-ci/deqp-freedreno-a630-noubo-fails.txt b/.gitlab-ci/deqp-freedreno-a630-noubo-fails.txt
new file mode 100644
index 00000000000..64f25970e92
--- /dev/null
+++ b/.gitlab-ci/deqp-freedreno-a630-noubo-fails.txt
@@ -0,0 +1 @@
+dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 0749fc917f3..5bcba584919 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -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