From 97e6bda35c080a43a22f9ca16b9dd019ad597deb Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 16:29:17 +0100 Subject: [PATCH] ci/deqp: build testlog tools on android `cuttlefish-runner.sh` uses them so we can't skip them Part-of: --- .gitlab-ci/container/build-deqp.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 279a3be5b9b..fad260f024f 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -187,11 +187,9 @@ case "${DEQP_API}" in # deqp-egl also comes from this build, but it is handled separately above. ;; esac -if [ "${DEQP_TARGET}" != 'android' ]; then - deqp_build_targets+=(testlog-to-xml) - deqp_build_targets+=(testlog-to-csv) - deqp_build_targets+=(testlog-to-junit) -fi +deqp_build_targets+=(testlog-to-xml) +deqp_build_targets+=(testlog-to-csv) +deqp_build_targets+=(testlog-to-junit) ninja "${deqp_build_targets[@]}" @@ -230,13 +228,13 @@ if [ "${DEQP_TARGET}" != 'android' ]; then # Compress the caselists, since Vulkan's in particular are gigantic; higher # compression levels provide no real measurable benefit. zstd -1 --rm /deqp/mustpass/*.txt - - # Save *some* executor utils, but otherwise strip things down - # to reduct deqp build size: - mv /deqp/executor/testlog-to-* /deqp - rm -rf /deqp/executor fi +# Save *some* executor utils, but otherwise strip things down +# to reduct deqp build size: +mv /deqp/executor/testlog-to-* /deqp +rm -rf /deqp/executor + # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above. rm -rf /deqp/external/**/mustpass/ rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*