From 8aff2281276c27c929c54ac4b98d564a92718cd8 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 11 Jan 2023 16:07:05 -0800 Subject: [PATCH] ci: Enable building the testing drivers with perfetto. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've talked about being able to capture perfetto traces from CI jobs for a while, and this would be a step toward that. Mostly it's that we occasionally break the perfetto build, so let's make sure we don't do that. Acked-by: Rob Clark Acked-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 2 ++ .gitlab-ci/meson/build.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index a9e7cf48044..8d89718c812 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -83,6 +83,7 @@ debian-testing: EXTRA_OPTION: > -D spirv-to-dxil=true -D valgrind=false + -D perfetto=true MINIO_ARTIFACT_NAME: mesa-amd64 LLVM_VERSION: "13" script: @@ -412,6 +413,7 @@ debian-arm64: -D llvm=disabled -D valgrind=false -D imagination-srv=true + -D perfetto=true MINIO_ARTIFACT_NAME: mesa-arm64 script: - .gitlab-ci/meson/build.sh diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index f50f8531c94..cc096410340 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -61,6 +61,7 @@ esac rm -rf _build meson _build --native-file=native.file \ --wrap-mode=nofallback \ + --force-fallback-for perfetto \ ${CROSS+--cross "$CROSS_FILE"} \ -D prefix=`pwd`/install \ -D libdir=lib \