From 82cd8614e6845dac3872e5048d448f80c3910741 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 10 Mar 2022 12:53:22 -0800
Subject: [PATCH] ci/deqp: Add gitlab-ci sections to deqp-runner.sh.

This should help highlight the actual test results, as opposed to the setup
and teardown.

Also tuned the "set -x"es a little bit so we get less surrounding noise in
the echo process.

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15332>
---
 .gitlab-ci/deqp-runner.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index e6cc3c8ceee..2df3e1efd8d 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo -e "\e[0Ksection_start:$(date +%s):test_setup[collapsed=true]\r\e[0Kpreparing test setup"
+
 set -ex
 
 # Needed so configuration files can contain paths to files in /install
@@ -157,7 +159,15 @@ if [ -z "$DEQP_SUITE" ]; then
     if [ $DEQP_VER != vk -a $DEQP_VER != egl ]; then
         export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --version-check `cat $INSTALL/VERSION | sed 's/[() ]/./g'`"
     fi
+fi
 
+set +x
+echo -e "\e[0Ksection_end:$(date +%s):test_setup\r\e[0K"
+
+echo -e "\e[0Ksection_start:$(date +%s):deqp[collapsed=false]\r\e[0Kdeqp-runner"
+set -x
+
+if [ -z "$DEQP_SUITE" ]; then
     deqp-runner \
         run \
         --deqp $DEQP \
@@ -186,7 +196,13 @@ fi
 
 DEQP_EXITCODE=$?
 
-quiet report_load
+set +x
+echo -e "\e[0Ksection_end:$(date +%s):deqp\r\e[0K"
+
+report_load
+
+echo -e "\e[0Ksection_start:$(date +%s):test_post_process[collapsed=true]\r\e[0Kpost-processing test results"
+set -x
 
 # Remove all but the first 50 individual XML files uploaded as artifacts, to
 # save fd.o space when you break everything.
@@ -222,4 +238,6 @@ if [ -n "$FLAKES_CHANNEL" ]; then
          --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}"
 fi
 
+echo -e "\e[0Ksection_end:$(date +%s):test_post_process\r\e[0K"
+
 exit $DEQP_EXITCODE