diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1 index f42838e4f9f..9d9843b8aa5 100644 --- a/.gitlab-ci/windows/mesa_deps_test.ps1 +++ b/.gitlab-ci/windows/mesa_deps_test.ps1 @@ -79,7 +79,7 @@ Pop-Location Get-Date Write-Host "Cloning Vulkan and GL Conformance Tests" $deqp_source = "C:\src\VK-GL-CTS\" -git clone --no-progress --single-branch https://github.com/lfrb/VK-GL-CTS.git -b windows-flush $deqp_source +git clone --no-progress --single-branch https://github.com/KhronosGroup/VK-GL-CTS.git -b vulkan-cts-1.3.4 $deqp_source if (!$?) { Write-Host "Failed to clone deqp repository" Exit 1 @@ -115,10 +115,10 @@ Copy-Item -Path "$($deqp_source)\doc\testlog-stylesheet\testlog.xsl" -Destinatio # Copy Vulkan must-pass list $deqp_mustpass = New-Item -ItemType Directory -Path $deqp_build -Name "mustpass" -$root_mustpass = Join-Path -Path $deqp_source -ChildPath "external\vulkancts\mustpass\master" +$root_mustpass = Join-Path -Path $deqp_source -ChildPath "external\vulkancts\mustpass\main" $files = Get-Content "$($root_mustpass)\vk-default.txt" foreach($file in $files) { - Get-Content "$($root_mustpass)\$($file)" | Add-Content -Path "$($deqp_mustpass)\vk-master.txt" + Get-Content "$($root_mustpass)\$($file)" | Add-Content -Path "$($deqp_mustpass)\vk-main.txt" } Remove-Item -Force -Recurse $deqp_source diff --git a/src/microsoft/ci/deqp-dozen.toml b/src/microsoft/ci/deqp-dozen.toml index 0f007f18d9c..5236a24859c 100644 --- a/src/microsoft/ci/deqp-dozen.toml +++ b/src/microsoft/ci/deqp-dozen.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-gl-config-name=rgba8888d24s8ms0", "--deqp-visibility=hidden", ] -caselists = ["/deqp/mustpass/vk-master.txt"] +caselists = ["/deqp/mustpass/vk-main.txt"] skips = ["./_install/warp-skips.txt"] flakes = ["./_install/warp-flakes.txt"] renderer_check = 'Microsoft Direct3D12 \(Microsoft Basic Render Driver\)'