From b83d0b2f5de926a86b371d2b48e59e26cbd159de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Tue, 12 Jan 2021 18:39:03 +0100 Subject: [PATCH] ci: Use meson test directly instead of ninja test The former allows specifying how many processes to spawn for tests. The latter seems to spawn (up to) as many test processes as there are CPU cores. Acked-by: Daniel Stone Part-of: --- .gitlab-ci/meson-build.sh | 2 +- .gitlab-ci/windows/mesa_build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index c6affea..ce912a7 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -58,6 +58,6 @@ meson _build --native-file=native.file \ cd _build meson configure ninja -LC_ALL=C.UTF-8 ninja test +LC_ALL=C.UTF-8 meson test --num-processes ${FDO_CI_CONCURRENT:-4} ninja install cd .. diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index e290060..db1fdb5 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 test" +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" $buildstatus = $? Pop-Location -- 2.7.4