fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 23:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ci: remove results directory content only with piglit runners

Browse source 
Removing the directory itself can be problematic with certain runner
strategies (B2C).

v2:
  - Better deleting pattern matching since the previously used one was
    problematic and not pointed out by /bin/sh, as noticed by Emma.

v3:
  - Check that the results directory exists before attempting to
    delete its content.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10856>
This commit is contained in:
Andres Gomez 2021-05-04 22:10:54 +03:00 • committed by Marge Bot
parent be05fecca0
commit 683ddf19dc
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci/piglit/run.sh
View file

@ -176,7 +176,9 @@ replay_minio_upload_images() {
SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\"" SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
rm -rf results if [ -d results ]; then
cd results && rm -rf ..?* .[!.]* *
fi
cd /piglit cd /piglit
if [ -n "$USE_CASELIST" ]; then if [ -n "$USE_CASELIST" ]; then

4
.gitlab-ci/piglit/run_cl.sh
View file

@ -5,7 +5,9 @@ set -o xtrace
VERSION=`cat install/VERSION` VERSION=`cat install/VERSION`
rm -rf results if [ -d results ]; then
cd results && rm -rf ..?* .[!.]* *
fi
cd /piglit cd /piglit
export OCL_ICD_VENDORS=$OLDPWD/install/etc/OpenCL/vendors/ export OCL_ICD_VENDORS=$OLDPWD/install/etc/OpenCL/vendors/