From 8e2ff175c658083ad680fdfb01f2722f846f594b Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 4 Sep 2025 19:42:39 +0200
Subject: [PATCH] ci/update_traces_checksum: fix regex detecting
 PIGLIT_REPLAY_DEVICE_NAME in job logs

`declare -x` is one way to export a variable, but there is also `export`.
LAVA uses the former, while CI-tron uses the latter.

LAVA always adds quotes, while CI-tron uses python's `shlex.quote()` [1]
which only adds the quotes when necessary, so let's make those optional
in the regex as well.

[1] https://docs.python.org/3/library/shlex.html#shlex.quote

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37215>
---
 bin/ci/update_traces_checksum.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ci/update_traces_checksum.py b/bin/ci/update_traces_checksum.py
index 5240053b086..755a7e81dda 100755
--- a/bin/ci/update_traces_checksum.py
+++ b/bin/ci/update_traces_checksum.py
@@ -25,7 +25,7 @@ from gitlab_common import (get_gitlab_project, read_token, wait_for_pipeline,
 
 
 DESCRIPTION_FILE = "export PIGLIT_REPLAY_DESCRIPTION_FILE=.*/install/(.*)$"
-DEVICE_NAME = "declare -x PIGLIT_REPLAY_DEVICE_NAME='(.*)'$"
+DEVICE_NAME = "(?:declare -x|export) PIGLIT_REPLAY_DEVICE_NAME='?([^']*)'?$"
 
 
 def gather_results(