ci/deqp: build testlog tools on android

`cuttlefish-runner.sh` uses them so we can't skip them

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32250>
This commit is contained in:
Eric Engestrom 2024-11-19 16:29:17 +01:00 committed by Marge Bot
parent e549b6fba2
commit 97e6bda35c

View File

@ -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*