Module: Mesa Branch: master Commit: 9705434579d2dea081fbd44195b54a4b6bee2b01 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9705434579d2dea081fbd44195b54a4b6bee2b01
Author: Andres Gomez <[email protected]> Date: Mon Aug 24 14:10:24 2020 +0300 ci: build piglit in the Vulkan testing image Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388> --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-piglit.sh | 12 +++++++++++- .gitlab-ci/container/x86_test-vk.sh | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8fd635635d..6ba290e50dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -367,7 +367,7 @@ x86_test-gl: x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2020-12-18-piglit-replayer" + MESA_IMAGE_TAG: &x86_test-vk "2020-12-19-build-piglit" # Debian 10 based ARM build image arm_build: diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/build-piglit.sh index bdde78c40cf..d3e958e71de 100644 --- a/.gitlab-ci/build-piglit.sh +++ b/.gitlab-ci/build-piglit.sh @@ -11,7 +11,17 @@ pushd /piglit git checkout c702d2bbf28b01a18ce613f386a4ffef03f6c0c9 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS -ninja +ninja $PIGLIT_BUILD_TARGETS find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf rm -rf target_api +if [ "x$PIGLIT_BUILD_TARGETS" = "xpiglit_replayer" ]; then + find ! -regex "^\.$" \ + ! -regex "^\.\/piglit.*" \ + ! -regex "^\.\/framework.*" \ + ! -regex "^\.\/bin$" \ + ! -regex "^\.\/bin\/replayer\.py" \ + ! -regex "^\.\/templates.*" \ + ! -regex "^\.\/tests$" \ + ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf +fi popd diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index e19a80aae2f..b00a739abe3 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -15,6 +15,7 @@ STABLE_EPHEMERAL=" \ liblz4-dev \ libpng-dev \ libvulkan-dev \ + libwaffle-dev \ libxcb-ewmh-dev \ libxkbcommon-dev \ libxrandr-dev \ @@ -22,6 +23,7 @@ STABLE_EPHEMERAL=" \ libzstd-dev \ meson \ p7zip \ + patch \ pkg-config \ python3-distutils \ wget \ @@ -35,7 +37,9 @@ apt-get install -y --no-remove \ libx11-xcb-dev \ libxcb-keysyms1-dev \ libxcb-shm0 \ - libxcb1-dev + libxcb1-dev \ + python3-lxml \ + python3-simplejson # We need multiarch for Wine dpkg --add-architecture i386 @@ -108,6 +112,10 @@ wine \ . .gitlab-ci/container/container_pre_build.sh +############### Build piglit + +PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/build-piglit.sh + ############### Build dEQP runner (and install rust temporarily for it) . .gitlab-ci/build-rust.sh . .gitlab-ci/build-deqp-runner.sh _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
