From 88a6c6a4385390a466184d04851e2d23d9069539 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Tue, 16 Feb 2021 23:26:42 +0200
Subject: [PATCH] ci: clean paths used in the piglit runner

When running with baremetal, the results path becomes //results. The
unexpected double backslash causes troubles when using sed
later.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9092>
---
 .gitlab-ci/piglit/run.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh
index 0e4c19c5a87..650f74ea3de 100755
--- a/.gitlab-ci/piglit/run.sh
+++ b/.gitlab-ci/piglit/run.sh
@@ -2,9 +2,9 @@
 
 set -ex
 
-INSTALL="$(pwd)/install"
+INSTALL=$(realpath -s "$PWD"/install)
 
-RESULTS="$(pwd)/results"
+RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"
 
 # Set up the driver environment.
@@ -228,12 +228,12 @@ fi
 
 if [ ${PIGLIT_HTML_SUMMARY:-1} -eq 1 ]; then
     ./piglit summary html --exclude-details=pass \
-        "$OLDPWD"/summary "$RESULTS"/results.json.bz2
+        "$RESULTS"/summary "$RESULTS"/results.json.bz2
 
     if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
-        find "$OLDPWD"/summary -type f -name "*.html" -print0 \
+        find "$RESULTS"/summary -type f -name "*.html" -print0 \
             | xargs -0 sed -i 's%<img src="file://'"${RESULTS}"'.*-\([0-9a-f]*\)\.png%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_ARTIFACTS_BASE_URL}"'/traces/\1.png%g'
-        find "$OLDPWD"/summary -type f -name "*.html" -print0 \
+        find "$RESULTS"/summary -type f -name "*.html" -print0 \
             | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL}"'/%g'
     fi