Revert "loader/dri3: Check for window destruction in dri3_wait_for_event_locked"

[mesa.git] / .gitlab-ci / lava-deqp.yml.jinja2

diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index 6e6620e221fbb75fd267bc73baa06a833d823dc8..1ee127224f4ad1f2f2e2043c8495c4d118ed35e2 100644 (file)
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -11,8 +11,9 @@ timeouts:
 priority: 75
 visibility: public
 {% if tags %}
+{% set lavatags = tags.split(',') %}
 tags:
-{% for tag in tags %}
+{% for tag in lavatags %}
   - {{ tag }}
 {% endfor %}
 {% endif %}
@@ -82,22 +83,17 @@ actions:
           - export {{ env_vars }}
 {% endif %}
 
+          # deqp-runner.sh assumes some stuff is in pwd
+          - cd /
+
           - export DEQP_NO_SAVE_RESULTS=1
-          - 'export DEQP_RUNNER_OPTIONS="--compact-display false --shuffle false"'
+          - 'export DEQP_RUNNER_OPTIONS="--shuffle false"'
           - export DEQP_EXPECTED_FAILS=deqp-{{ gpu_version }}-fails.txt
           - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt
           - export DEQP_VER={{ deqp_version }}
           - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
 
-          # Put stuff where the runner script expects it
-          - mkdir artifacts
-          - mkdir results
-          - mkdir -p install/lib
-          - cp /deqp/$DEQP_EXPECTED_FAILS artifacts/.
-          - cp /deqp/$DEQP_SKIPS artifacts/.
-          - mv /mesa/lib/* install/lib/.
-
-          - "if sh /deqp/deqp-runner.sh; then
+          - "if sh /install/deqp-runner.sh; then
                   echo 'deqp: pass';
              else
                   echo 'deqp: fail';