diff --git a/README b/README index 5cb8ebb3..27da28b7 100644 --- a/README +++ b/README @@ -86,6 +86,9 @@ commas or semicolons. platform controls the behavior of todo(), todo_if(), bug_if() and broken() 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. If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader diff --git a/gitlab/test.yml b/gitlab/test.yml index da01425f..2e8ee834 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -19,13 +19,13 @@ test-win-64: extends: .test-win variables: TEST_ARCH: "64" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-32: extends: .test-win variables: TEST_ARCH: "32" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-64-dxc: stage: test diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e91db918..c2fc30d1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2158,7 +2158,7 @@ static IDxcCompiler3 *dxcompiler_create(void) HRESULT hr; 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; #ifdef VKD3D_CROSSTEST