ci/deqp-runner: pass EXTRA_CARGO_ARGS

Without EXTRA_CARGO_ARGS='--target armv7-unknown-linux-gnueabihf',
deqp-runner binary was built for aarch64 architecture for arm32
builds and causing below failures on arm32 target,
/usr/bin/deqp-runner: cannot execute binary file: Exec format error

So pass EXTRA_CARGO_ARGS to cargo to fix this.

Fixes: 83d9cfa5 ("ci/deqp-runner: build from git checkout even on linux")
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31071>
This commit is contained in:
Vignesh Raman
2024-09-06 20:30:06 +05:30
committed by Marge Bot
parent 51157e7440
commit c6a9a9c3bc
2 changed files with 5 additions and 4 deletions

View File

@@ -59,6 +59,7 @@ if [[ "$RUST_TARGET" != *-android ]]; then
cargo install --locked \
-j ${FDO_CI_CONCURRENT:-4} \
--root /usr/local \
${EXTRA_CARGO_ARGS} \
--path .
CC=$SAVEDCC
else

View File

@@ -27,10 +27,10 @@ variables:
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20240826-runner"
DEBIAN_TEST_GL_TAG: "20240830-piglit-93"
DEBIAN_TEST_VK_TAG: "20240830-piglit-93"
KERNEL_ROOTFS_TAG: "20240902-mtlfw"
DEBIAN_TEST_ANDROID_TAG: "20240906-deqp"
DEBIAN_TEST_GL_TAG: "20240906-deqp"
DEBIAN_TEST_VK_TAG: "20240906-deqp"
KERNEL_ROOTFS_TAG: "20240906-deqp"
ALPINE_X86_64_BUILD_TAG: "20240814-var"
ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"