wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC.

Browse Source 
For consistency with the other VKD3D_TEST_* environment variables.
This commit is contained in:
Henri Verbeet 2024-05-27 20:13:53 +02:00 committed by Alexandre Julliard
parent 695ef722e8
commit 9693271dcf
Notes: Alexandre Julliard 2024-05-27 23:24:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/891
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -86,6 +86,9 @@ commas or semicolons.
platform controls the behavior of todo(), todo_if(), bug_if() and broken() platform controls the behavior of todo(), todo_if(), bug_if() and broken()
conditions in tests. conditions in tests.
* VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will
be skipped.
* VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.
If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader

4
gitlab/test.yml
View File

@ -19,13 +19,13 @@ test-win-64:
extends: .test-win extends: .test-win
variables: variables:
TEST_ARCH: "64" TEST_ARCH: "64"
VKD3D_TESTS_SKIP_DXC: "1" VKD3D_TEST_SKIP_DXC: "1"
test-win-32: test-win-32:
extends: .test-win extends: .test-win
variables: variables:
TEST_ARCH: "32" TEST_ARCH: "32"
VKD3D_TESTS_SKIP_DXC: "1" VKD3D_TEST_SKIP_DXC: "1"
test-win-64-dxc: test-win-64-dxc:
stage: test stage: test

2
tests/shader_runner.c
View File

@ -2158,7 +2158,7 @@ static IDxcCompiler3 *dxcompiler_create(void)
HRESULT hr; HRESULT hr;
void *dll; void *dll;
if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) if ((skip_dxc = getenv("VKD3D_TEST_SKIP_DXC")) && strcmp(skip_dxc, "") != 0)
return NULL; return NULL;
#ifdef VKD3D_CROSSTEST #ifdef VKD3D_CROSSTEST