diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-02-12 15:41:30 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-19 08:50:38 +0000 |
| commit | fc0d1aab505fc9214842a7f10e2f1b040be9edc2 (patch) | |
| tree | 56cc259ae75c6dab72ae0ea49b5dd354d9369288 /.gitlab-ci | |
| parent | 7fedf51b959e0d18cefff7b8556578279eab21f6 (diff) | |
Revert "ci: disable glcpp tests for now"
This reverts commit e25a3e21f83390342a1de5f13d41caa0ea076dfa.
The test timeouts should be fixed now.
Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/meson/build.sh | 1 | ||||
| -rw-r--r-- | .gitlab-ci/windows/mesa_build.ps1 | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index 374be8306cf..7300d70418b 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 c85724d01d8..839698bb9b8 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 |