OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/windows: Update vk-gl-cts to pick up new zlib dependency

Browse Source 
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19187>
This commit is contained in:
Jesse Natalie
2022-10-19 07:11:28 -07:00
committed by Marge Bot
parent fe78a8910c
commit 9edc23f075
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/windows/mesa_deps_test.ps1
View File

@@ -79,7 +79,7 @@ Pop-Location
Get-Date Get-Date
Write-Host "Cloning Vulkan and GL Conformance Tests" Write-Host "Cloning Vulkan and GL Conformance Tests"
$deqp_source = "C:\src\VK-GL-CTS\" $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 (!$?) { if (!$?) {
Write-Host "Failed to clone deqp repository" Write-Host "Failed to clone deqp repository"
Exit 1 Exit 1
@@ -115,10 +115,10 @@ Copy-Item -Path "$($deqp_source)\doc\testlog-stylesheet\testlog.xsl" -Destinatio
# Copy Vulkan must-pass list # Copy Vulkan must-pass list
$deqp_mustpass = New-Item -ItemType Directory -Path $deqp_build -Name "mustpass" $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" $files = Get-Content "$($root_mustpass)\vk-default.txt"
foreach($file in $files) { 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 Remove-Item -Force -Recurse $deqp_source

2
src/microsoft/ci/deqp-dozen.toml
View File

@@ -7,7 +7,7 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0", "--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden", "--deqp-visibility=hidden",
] ]
caselists = ["/deqp/mustpass/vk-master.txt"] caselists = ["/deqp/mustpass/vk-main.txt"]
skips = ["./_install/warp-skips.txt"] skips = ["./_install/warp-skips.txt"]
flakes = ["./_install/warp-flakes.txt"] flakes = ["./_install/warp-flakes.txt"]
renderer_check = 'Microsoft Direct3D12 \(Microsoft Basic Render Driver\)' renderer_check = 'Microsoft Direct3D12 \(Microsoft Basic Render Driver\)'