summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Natalie <jenatali@microsoft.com>2021-11-21 06:38:20 -0800
committerMarge Bot <emma+marge@anholt.net>2021-12-01 18:26:15 +0000
commit214168621d4594141c1215b4c21a2c237bf868b4 (patch)
treed4b7190790ea6cebfee5f5bb2cbc12bb3f08fa74
parent145b0711fcb494eacdb8917b02d0b9e884621852 (diff)
CI/windows: Move D3D12 test YML to D3D12 driver folder
Reviewed-by: Enrico Galli <enrico.galli@intel.com> Acked-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13902>
-rw-r--r--.gitlab-ci.yml25
-rw-r--r--src/gallium/drivers/d3d12/ci/gitlab-ci.yml23
2 files changed, 24 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67c4dee0f16..758d0e559e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,7 @@ include:
- local: 'src/broadcom/ci/gitlab-ci.yml'
- local: 'src/etnaviv/ci/gitlab-ci.yml'
- local: 'src/freedreno/ci/gitlab-ci.yml'
+ - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml'
- local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml'
- local: 'src/gallium/drivers/iris/ci/gitlab-ci.yml'
- local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml'
@@ -1032,30 +1033,6 @@ windows-vs2019:
- _build/meson-logs/*.txt
- _install/
-test-d3d12-windows:
- extends:
- - .build-windows
- - .use-windows_build_vs2019
- - .windows-test-rules
- stage: layered-backends
- dependencies:
- - windows-vs2019
- needs:
- - windows-vs2019
- variables:
- GIT_STRATEGY: none # testing doesn't build anything from source
- GALLIUM_DRIVER: d3d12
- PIGLIT_PROFILE: quick_gl
- PIGLIT_TESTS: -x nv_copy_depth_to_color
- script:
- - . _install/piglit_run.ps1
- artifacts:
- when: on_failure
- name: "mesa_${CI_JOB_NAME}"
- paths:
- - summary/
- - result.txt
-
test-spirv2dxil-windows:
extends:
- .build-windows
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
new file mode 100644
index 00000000000..09bb8a9a99c
--- /dev/null
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -0,0 +1,23 @@
+test-d3d12-windows:
+ extends:
+ - .build-windows
+ - .use-windows_build_vs2019
+ - .windows-test-rules
+ stage: layered-backends
+ dependencies:
+ - windows-vs2019
+ needs:
+ - windows-vs2019
+ variables:
+ GIT_STRATEGY: none # testing doesn't build anything from source
+ GALLIUM_DRIVER: d3d12
+ PIGLIT_PROFILE: quick_gl
+ PIGLIT_TESTS: -x nv_copy_depth_to_color
+ script:
+ - . _install/piglit_run.ps1
+ artifacts:
+ when: on_failure
+ name: "mesa_${CI_JOB_NAME}"
+ paths:
+ - summary/
+ - result.txt