From a9e6a3ecc7de79dbaa8899d77c3b86fd303b513a Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 17 Apr 2020 12:28:58 -0700
Subject: [PATCH] ci: Enable --compact-display false on all dEQP runs.

We always want to see status updates happening in the logs, otherwise it
can like maybe your machine hung until the run actually completes.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4621>
---
 .gitlab-ci.yml                  | 5 ++---
 .gitlab-ci/bare-metal/init.sh   | 1 -
 .gitlab-ci/deqp-runner.sh       | 1 +
 .gitlab-ci/lava-deqp.yml.jinja2 | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d79b31be89..c8d288e3832 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -721,7 +721,6 @@ virgl-gles2:
     DEQP_PARALLEL: 4
     NIR_VALIDATE: 0
     DEQP_NO_SAVE_RESULTS: 1
-    DEQP_RUNNER_OPTIONS: "--compact-display false"
     # Don't use threads inside llvmpipe, we've already got all 4 cores
     # busy with DEQP_PARALLEL.
     LP_NUM_THREADS: 0
@@ -737,7 +736,7 @@ virgl-gles3:
     DEQP_VER: gles3
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 3
-    DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120"
+    DEQP_RUNNER_OPTIONS: "--timeout 120"
   extends: virgl-gles2
 
 virgl-gles31:
@@ -746,7 +745,7 @@ virgl-gles31:
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 10
     DEQP_OPTIONS: "--deqp-log-images=disable"
-    DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120"
+    DEQP_RUNNER_OPTIONS: "--timeout 120"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
   extends: virgl-gles2
diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index 39a5a3c2812..437474b6266 100644
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -9,7 +9,6 @@ mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 
 export DEQP_NO_SAVE_RESULTS=1
-export DEQP_RUNNER_OPTIONS="--compact-display false"
 export DEQP_VER=DEQP_VER_REPLACE
 export DEQP_PARALLEL=DEQP_PARALLEL_REPLACE
 export CI_NODE_INDEX=CI_NODE_INDEX_REPLACE
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index fa525e2615b..5467be58f30 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -84,6 +84,7 @@ run_cts() {
         --output $output \
         --caselist $caselist \
         --exclude-list $INSTALL/$DEQP_SKIPS \
+        --compact-display false \
         $XFAIL \
         $JOB \
 	--allow-flakes true \
diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index e7d980ec0cc..1ee127224f4 100644
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -87,7 +87,7 @@ actions:
           - 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 }}
-- 
2.30.2