summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2020-04-17 12:28:58 -0700
committerMarge Bot <eric+marge@anholt.net>2020-04-27 22:10:10 +0000
commita9e6a3ecc7de79dbaa8899d77c3b86fd303b513a (patch)
treecb89d624b024e644585b50a609baddca2b2d1a3f /.gitlab-ci
parentacc56300dcc0b026d219181854ae475dfc0e926e (diff)
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>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/bare-metal/init.sh1
-rwxr-xr-x.gitlab-ci/deqp-runner.sh1
-rw-r--r--.gitlab-ci/lava-deqp.yml.jinja22
3 files changed, 2 insertions, 2 deletions
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 }}