diff options
| author | Andres Gomez <agomez@igalia.com> | 2021-02-16 23:26:42 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-02-17 14:37:35 +0000 |
| commit | 88a6c6a4385390a466184d04851e2d23d9069539 (patch) | |
| tree | 0e4786c166f2b48288c39c8ad3e328bd10a061de /.gitlab-ci/piglit | |
| parent | 90d6365ad4a1ee2e7cf8105d4a4ed34d926d17a7 (diff) | |
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>
Diffstat (limited to '.gitlab-ci/piglit')
| -rwxr-xr-x | .gitlab-ci/piglit/run.sh | 10 |
1 files 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 |