[PATCH 1/2] d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
 dlls/d3dcompiler_43/tests/hlsl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c
index 8985cd51bb6..868693838cc 100644
--- a/dlls/d3dcompiler_43/tests/hlsl.c
+++ b/dlls/d3dcompiler_43/tests/hlsl.c
@@ -630,7 +630,11 @@ static BOOL load_d3dcompiler(void)
 {
     HMODULE module;
 
+#if D3D_COMPILER_VERSION == 47
+    if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE;
+#else
     if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
+#endif
 
     ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile");
     return TRUE;
@@ -648,7 +652,7 @@ START_TEST(hlsl)
 
     if (!load_d3dcompiler())
     {
-        win_skip("Could not load d3dcompiler_43.dll\n");
+        win_skip("Could not load DLL.\n");
         return;
     }
 
-- 
2.24.1

[PATCH 2/2] d3dcompiler/tests: Load the correct d3dcompiler DLL in the asm tests.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
 dlls/d3dcompiler_43/tests/asm.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c
index 900e6628439..749b1153267 100644
--- a/dlls/d3dcompiler_43/tests/asm.c
+++ b/dlls/d3dcompiler_43/tests/asm.c
@@ -1725,7 +1725,11 @@ static BOOL load_d3dcompiler(void)
 {
     HMODULE module;
 
+#if D3D_COMPILER_VERSION == 47
+    if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE;
+#else
     if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
+#endif
 
     pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble");
     ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess");
@@ -1736,7 +1740,7 @@ START_TEST(asm)
 {
     if (!load_d3dcompiler())
     {
-        win_skip("Could not load d3dcompiler_43.dll\n");
+        win_skip("Could not load DLL.\n");
         return;
     }
 
-- 
2.24.1