From 1fc98414b6b054bef17a5c5e172dd80465564300 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 6 Jun 2023 00:35:35 +0200 Subject: [PATCH] ci/traces: print version of apps used for replaying traces Reviewed-by: Guilherme Gallo Reviewed-by: Eric Engestrom Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/piglit/piglit-traces.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index c64e84e1635..8bb9b902838 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -4,6 +4,9 @@ set -ex +# Our rootfs may not have "less", which apitrace uses during apitrace dump +export PAGER=cat # FIXME: export everywhere + INSTALL=$(realpath -s "$PWD"/install) S3_ARGS="--token-file ${CI_JOB_JWT_FILE}" @@ -58,22 +61,18 @@ quiet() { # Set environment for apitrace executable. export PATH="/apitrace/build:$PATH" - export PIGLIT_REPLAY_WINE_BINARY=wine export PIGLIT_REPLAY_WINE_APITRACE_BINARY="/apitrace-msvc-win64/bin/apitrace.exe" export PIGLIT_REPLAY_WINE_D3DRETRACE_BINARY="/apitrace-msvc-win64/bin/d3dretrace.exe" -# Our rootfs may not have "less", which apitrace uses during -# apitrace dump -export PAGER=cat +echo "Version:" +apitrace version 2>/dev/null || echo "apitrace not found (Linux)" SANITY_MESA_VERSION_CMD="wflinfo" HANG_DETECTION_CMD="" - # Set up the platform windowing system. - if [ "$EGL_PLATFORM" = "surfaceless" ]; then # Use the surfaceless EGL platform. export DISPLAY=