From af96ed09f074b4a39d0eea2080327f202995ae3e Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Fri, 15 Nov 2024 11:03:23 +0100 Subject: [PATCH] ci/deqp: force overwriting exiting files when compressing with zstd This does not change the behavior in CI runs where the files are always created from scratch, but it helps on local invocations when running the command multiple times on the same rootfs. It prevents build-deqp.sh to stop at the command line prompt for questions like: ----------------------------------------------------------------------- zstd: mustpass/egl-main.txt.zst already exists; overwrite (y/n) ? y zstd: mustpass/gles2-khr-main.txt.zst already exists; overwrite (y/n) ? y => 5% zstd: mustpass/gles2-main.txt.zst already exists; overwrite (y/n) ? y => 6% ----------------------------------------------------------------------- ... Part-of: --- .gitlab-ci/container/build-deqp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 9a16f7655f7..e7de5458946 100755 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -289,7 +289,7 @@ if [ "$DEQP_API" != tools ]; then # Compress the caselists, since Vulkan's in particular are gigantic; higher # compression levels provide no real measurable benefit. - zstd -1 --rm mustpass/*.txt + zstd -f -1 --rm mustpass/*.txt fi if [ "$DEQP_API" = tools ]; then