From fc0d1aab505fc9214842a7f10e2f1b040be9edc2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Fri, 12 Feb 2021 15:41:30 +0100 Subject: [PATCH] Revert "ci: disable glcpp tests for now" This reverts commit e25a3e21f83390342a1de5f13d41caa0ea076dfa. The test timeouts should be fixed now. Reviewed-by: Dylan Baker Part-of: --- .gitlab-ci/meson/build.sh | 1 - .gitlab-ci/windows/mesa_build.ps1 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index 374be83..7300d70 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -64,7 +64,6 @@ 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 c85724d..839698b 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 -Dvulkan-drivers=swrast -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" +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 -Dvulkan-drivers=swrast -Dgallium-drivers=swrast,d3d12 -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dbuild-tests=true && ninja -j32 install && meson test --num-processes 32" $buildstatus = $? Pop-Location -- 2.7.4