From e42ef902dee66af426212d2af1606d3aeb46817f Mon Sep 17 00:00:00 2001 From: Helen Koike Date: Mon, 21 Nov 2022 14:27:33 -0300 Subject: [PATCH] ci: compile deqp-runner for android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To allow testing mesa on android, we need deqp-runner compiled for it, so we can add android on the ci. Signed-off-by: Helen Koike Reviewed-by: Sergi Blanch Torné Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 33 ++++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index 823c6691645..d526c7583f7 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -19,10 +19,35 @@ else DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner" fi -cargo install --locked \ - -j ${FDO_CI_CONCURRENT:-4} \ - --root /usr/local \ - ${DEQP_RUNNER_CARGO_ARGS} +if [ -z "$ANDROID_NDK_HOME" ]; then + cargo install --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local \ + ${DEQP_RUNNER_CARGO_ARGS} +else + mkdir -p /deqp-runner + pushd /deqp-runner + git clone --branch v0.16.1 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git + pushd deqp-runner-git + + cargo install --locked \ + -j ${FDO_CI_CONCURRENT:-4} \ + --root /usr/local --version 2.10.0 \ + cargo-ndk + + rustup target add x86_64-linux-android + RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target x86_64-linux-android build + + mv target/x86_64-linux-android/debug/deqp-runner /deqp-runner + + cargo uninstall --locked \ + --root /usr/local \ + cargo-ndk + + popd + rm -rf deqp-runner-git + popd +fi # remove unused test runners to shrink images for the Mesa CI build (not kernel, # which chooses its own deqp branch)