wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

ci: Execute DXC tests on 32-bit as well.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-30 20:47:46 +01:00
committed by Henri Verbeet
parent 92f22edb88
commit d6d1485e40
Notes: Henri Verbeet 2025-11-03 18:01:36 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1810
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gitlab/test.yml
View File

@@ -12,7 +12,6 @@
- 'Expand-Archive -Path "warp.zip" -DestinationPath ".\warp"' - 'Expand-Archive -Path "warp.zip" -DestinationPath ".\warp"'
- 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/dxc_2025_02_20.zip" -OutFile ".\dxc.zip"' - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/dxc_2025_02_20.zip" -OutFile ".\dxc.zip"'
- 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"' - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
- '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")'
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)' - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
- if (Test-Path "pipeline_failed") { exit 1 } - if (Test-Path "pipeline_failed") { exit 1 }
artifacts: artifacts:
@@ -21,6 +20,7 @@
- artifacts - artifacts
exclude: exclude:
- artifacts/**/d3d10warp.dll - artifacts/**/d3d10warp.dll
- artifacts/**/dxcompiler.dll
test-win-64: test-win-64:
extends: .test-win extends: .test-win
@@ -32,5 +32,4 @@ test-win-32:
extends: .test-win extends: .test-win
variables: variables:
TEST_ARCH: "32" TEST_ARCH: "32"
VKD3D_TEST_SKIP_DXC: "1"
VKD3D_TEST_DEBUG: '1' VKD3D_TEST_DEBUG: '1'

12
tests/driver.c
View File

@@ -154,6 +154,12 @@ static bool run_tests_for_directory(const char *commit_dir)
fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError()); fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError());
ret = false; ret = false;
} }
sprintf(dest_filename, "artifacts\\%s\\tests\\dxcompiler.dll", commit_dir);
if (!CopyFileA(".\\dxc\\bin\\x64\\dxcompiler.dll", dest_filename, FALSE))
{
fprintf(stderr, "Cannot copy dxcompiler.dll, last error %ld.\n", GetLastError());
ret = false;
}
} }
else else
{ {
@@ -163,6 +169,12 @@ static bool run_tests_for_directory(const char *commit_dir)
fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError()); fprintf(stderr, "Cannot copy d3d10warp.dll, last error %ld.\n", GetLastError());
ret = false; ret = false;
} }
sprintf(dest_filename, "artifacts\\%s\\tests\\dxcompiler.dll", commit_dir);
if (!CopyFileA(".\\dxc\\bin\\x86\\dxcompiler.dll", dest_filename, FALSE))
{
fprintf(stderr, "Cannot copy dxcompiler.dll, last error %ld.\n", GetLastError());
ret = false;
}
} }
sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir); sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir);