Mesa (master): ci: disable glcpp tests for now
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 28 16:12:21 UTC 2021
Module: Mesa
Branch: master
Commit: e25a3e21f83390342a1de5f13d41caa0ea076dfa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e25a3e21f83390342a1de5f13d41caa0ea076dfa
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Wed Jan 27 09:25:28 2021 -0500
ci: disable glcpp tests for now
these are too flaky to continue running for now
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8738>
---
.gitlab-ci/meson-build.sh | 1 +
.gitlab-ci/windows/mesa_build.ps1 | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index ce912a74e6b..0330b77e609 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -48,6 +48,7 @@ meson _build --native-file=native.file \
-D libdir=lib \
-D buildtype=${BUILDTYPE:-debug} \
-D build-tests=true \
+ -D enable-glcpp-tests=false \
-D libunwind=${UNWIND} \
${DRI_LOADERS} \
-D dri-drivers=${DRI_DRIVERS:-[]} \
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index db1fdb5b1b4..f62da6b43c3 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -7,7 +7,7 @@ Write-Host "Compiling Mesa"
$builddir = New-Item -ItemType Directory -Name "_build"
$installdir = New-Item -ItemType Directory -Name "_install"
Push-Location $builddir.FullName
-cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path=`"C:\llvm-10`" --pkg-config-path=`"C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig`" --prefix=`"$installdir`" -Dllvm=enabled -Dshared-llvm=disabled -Dgallium-drivers=swrast,d3d12 -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dbuild-tests=true && ninja -j32 install && meson test --num-processes 32"
+cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path=`"C:\llvm-10`" --pkg-config-path=`"C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig`" --prefix=`"$installdir`" -Dllvm=enabled -Dshared-llvm=disabled -Dgallium-drivers=swrast,d3d12 -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dbuild-tests=true -Denable-glcpp-tests=false && ninja -j32 install && meson test --num-processes 32"
$buildstatus = $?
Pop-Location
More information about the mesa-commit
mailing list