aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-05-26 13:28:30 -0700
committerMarge Bot <[email protected]>2020-05-28 16:23:59 +0000
commitf0c102c075f8ac76629bb34619187262ccc3e9d8 (patch)
treef97bb41dc83959e8fdeb2d62cae6ade87781a4a2
parent46d9b500f4fa57affbb75ffe092dcf23a717706f (diff)
ci: Quick exit qpa extraction for non-matching qpas.
When you're bringing up a new driver in CI with significant number of failures (or when a CI run breaks a driver), the QPA extraction can easily take the whole job timeout as we go about processing each QPA (100 of them in my early VK CI fails) per unexpected result we're saving (50), which involves reading and each line of the file in shell. By quickly filtering out the QPA files not including our test, we can save all that shell overhead, bringing QPA extract time down to a couple of minutes. Reviewed-by: Kristian H. Kristensen <[email protected]> Reviewed-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5225>
-rwxr-xr-x.gitlab-ci/deqp-runner.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index d6e04939c58..bcaa5d39afd 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -133,7 +133,13 @@ extract_xml_result() {
shift 1
qpas=$*
start="#beginTestCaseResult $testcase"
- for qpa in $qpas; do
+
+ # Pick the first QPA mentioning our testcase
+ qpa=`grep -l "$start" $qpas | head -n 1`
+
+ # If we found one, go extract just that testcase's contents from the QPA
+ # to a new QPA, then do testlog-to-xml on that.
+ if [ -n "$qpa" ]; then
while IFS= read -r line; do
if [ "$line" = "$start" ]; then
dst="$testcase.qpa"
@@ -155,7 +161,7 @@ extract_xml_result() {
return 1
fi
done < $qpa
- done
+ fi
}
extract_xml_results() {