Zebediah Figura : d3dcompiler_46/tests: Enable tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e44bd0e03f1e50f9d50d6b3a6c78e6ad0d580a8e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e44bd0e03f1e50f9d50d6b3a6c78e6ad0d580a8e

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Wed Sep  1 12:12:50 2021 -0500

d3dcompiler_46/tests: Enable tests.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure                             |  1 +
 configure.ac                          |  1 +
 dlls/d3dcompiler_43/tests/asm.c       |  2 +-
 dlls/d3dcompiler_46/Makefile.in       |  1 +
 dlls/d3dcompiler_46/tests/Makefile.in | 11 +++++++++++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 5ed46f75b84..b879415ff6c 100755
--- a/configure
+++ b/configure
@@ -20363,6 +20363,7 @@ wine_fn_config_makefile dlls/d3dcompiler_42 enable_d3dcompiler_42
 wine_fn_config_makefile dlls/d3dcompiler_43 enable_d3dcompiler_43
 wine_fn_config_makefile dlls/d3dcompiler_43/tests enable_tests
 wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46
+wine_fn_config_makefile dlls/d3dcompiler_46/tests enable_tests
 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47
 wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests
 wine_fn_config_makefile dlls/d3dim enable_d3dim
diff --git a/configure.ac b/configure.ac
index 68b666e455f..8c4985c0294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3062,6 +3062,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_42)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46)
+WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dim)
diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c
index 3b765d3dae8..e467cec9623 100644
--- a/dlls/d3dcompiler_43/tests/asm.c
+++ b/dlls/d3dcompiler_43/tests/asm.c
@@ -1726,7 +1726,7 @@ static void test_disassemble_shader(void)
 
     hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob);
 todo_wine
-#if D3D_COMPILER_VERSION == 47
+#if D3D_COMPILER_VERSION >= 46
     ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
 #else
     ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in
index f58176c61eb..9d3c6546923 100644
--- a/dlls/d3dcompiler_46/Makefile.in
+++ b/dlls/d3dcompiler_46/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = d3dcompiler_46.dll
+IMPORTLIB = d3dcompiler_46
 IMPORTS   = dxguid uuid
 EXTRADEFS = -DD3D_COMPILER_VERSION=46
 PARENTSRC = ../d3dcompiler_43
diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in
new file mode 100644
index 00000000000..7d2b899c0eb
--- /dev/null
+++ b/dlls/d3dcompiler_46/tests/Makefile.in
@@ -0,0 +1,11 @@
+TESTDLL   = d3dcompiler_46.dll
+IMPORTS   = d3d9 user32 d3dcompiler_46
+EXTRADEFS = -DD3D_COMPILER_VERSION=46
+PARENTSRC = ../../d3dcompiler_43/tests
+
+C_SRCS = \
+	asm.c \
+	blob.c \
+	hlsl_d3d11.c \
+	hlsl_d3d9.c \
+	reflection.c