From: Eric Anholt <eric@anholt.net>
Date: Mon, 26 Aug 2019 19:57:16 +0000 (-0700)
Subject: gitlab-ci: Log the driver version that got tested.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b6b0c09f438c18b18a5f9e444d178767fb0bafb;p=mesa.git

gitlab-ci: Log the driver version that got tested.

Sometimes you just want confirmation that dEQP really picked up the
driver we built you thought.  This is not as good as one might like,
because git isn't present in the cross-build image.

Acked-by: Rob Clark <robdclark@chromium.org>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index b2a9cd40ebb..bb9c7c80d56 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -102,6 +102,13 @@ if grep -q "dEQP-.*.info.renderer" /tmp/case-list.txt; then
     fi
 fi
 
+if grep -q "dEQP-.*.info.version" /tmp/case-list.txt; then
+    # This is an ugly dependency on the .qpa format: Print 3 lines after the
+    # match, which happens to contain the result.
+    VERSION=`sed -n '/#beginTestCaseResult dEQP-.*.info.version/{n;n;n;p}' $RESULTS/results.qpa | sed -n -E "s|<Text>(.*)</Text>|\1|p"`
+    echo "Driver version tested: $VERSION"
+fi
+
 if [ $DEQP_EXITCODE -ne 0 ]; then
    exit $DEQP_EXITCODE
 fi