Mesa (main): ci/dzn: Move to a .toml description

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1987fb00918f36de1de6a3c4957d56c061c6f31e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1987fb00918f36de1de6a3c4957d56c061c6f31e

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Mon Jun 20 14:14:54 2022 +0200

ci/dzn: Move to a .toml description

This way we don't force a CI run on all platforms anytime we add a
group of test, and, as a bonus, we make dozen CI consistent with other
platforms.

Suggested-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Suggested-by: Emma Anholt <emma at anholt.net>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17074>

---

 .gitlab-ci/windows/deqp_runner_run.ps1 |  9 ++-------
 .gitlab-ci/windows/mesa_build.ps1      |  1 +
 src/microsoft/ci/deqp-dozen.toml       | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/windows/deqp_runner_run.ps1 b/.gitlab-ci/windows/deqp_runner_run.ps1
index 85a09e3e78e..e940fee0462 100644
--- a/.gitlab-ci/windows/deqp_runner_run.ps1
+++ b/.gitlab-ci/windows/deqp_runner_run.ps1
@@ -13,17 +13,12 @@ New-Item -Path $hkey_path -force
 New-ItemProperty -Path $hkey_path -Name $hkey_name -Value 0 -PropertyType DWORD
 
 $results = New-Item -ItemType Directory results
-$deqp_options = @("--deqp-surface-width", 256, "--deqp-surface-height", 256, "--deqp-surface-type", "pbuffer", "--deqp-gl-config-name", "rgba8888d24s8ms0", "--deqp-visibility", "hidden")
-$deqp_module = "C:\deqp\external\vulkancts\modules\vulkan\deqp-vk.exe"
-$caselist = "C:\deqp\mustpass\vk-master.txt"
 $baseline = ".\_install\warp-fails.txt"
-$flakes = ".\_install\warp-flakes.txt"
-$skips = ".\_install\warp-skips.txt"
-$includes = @("-t", "dEQP-VK.api.*", "-t", "dEQP-VK.binding_model.*", "-t", "dEQP-VK.info.*", "-t", "dEQP-VK.draw.*", "-t", "dEQP-VK.query_pool.*", "-t", "dEQP-VK.memory.*", "-t", "dEQP-VK.pipeline.vertex_input.*", "-t", "dEQP-VK.dynamic_state.*", "-t", "dEQP-VK.geometry.*")
+$suite = ".\_install\deqp-dozen.toml"
 
 $env:DZN_DEBUG = "warp"
 $env:MESA_VK_IGNORE_CONFORMANCE_WARNING = "true"
-deqp-runner run --deqp $($deqp_module) --output $($results) --caselist $($caselist) --baseline $($baseline) --flakes $($flakes) --skips $($skips) $($includes) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe --jobs 4 --fraction 3  -- $($deqp_options)
+deqp-runner suite --suite $($suite) --output $($results) --baseline $($baseline) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe --jobs 4 --fraction 3
 $deqpstatus = $?
 
 $template = "See https://$($env:CI_PROJECT_ROOT_NAMESPACE).pages.freedesktop.org/-/$($env:CI_PROJECT_NAME)/-/jobs/$($env:CI_JOB_ID)/artifacts/results/{{testcase}}.xml"
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 6eb9c98660f..372471e6a98 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -79,5 +79,6 @@ Copy-Item ".\.gitlab-ci\windows\spirv2dxil_check.ps1" -Destination $installdir
 Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir
 
 Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir
+Copy-Item ".\src\microsoft\ci\deqp-dozen.toml" -Destination $installdir
 
 Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Filter "*.txt" | Copy-Item -Destination $installdir
diff --git a/src/microsoft/ci/deqp-dozen.toml b/src/microsoft/ci/deqp-dozen.toml
new file mode 100644
index 00000000000..72c611cfdd5
--- /dev/null
+++ b/src/microsoft/ci/deqp-dozen.toml
@@ -0,0 +1,24 @@
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk.exe"
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden",
+]
+caselists = ["/deqp/mustpass/vk-master.txt"]
+skips = ["./_install/warp-skips.txt"]
+flakes = ["./_install/warp-flakes.txt"]
+renderer_check = 'Microsoft Direct3D12 \(Microsoft Basic Render Driver\)'
+include = [
+    "dEQP-VK.api.*",
+    "dEQP-VK.binding_model.*",
+    "dEQP-VK.draw.*",
+    "dEQP-VK.dynamic_state.*",
+    "dEQP-VK.geometry.*",
+    "dEQP-VK.info.*",
+    "dEQP-VK.memory.*",
+    "dEQP-VK.pipeline.vertex_input.*",
+    "dEQP-VK.query_pool.*",
+]