[tests] Remove D3D9 tests

cherry picked from commit doitsujin@a11fb56
Gcenx · Mar 14, 2023 · c63342e · c63342e
1 parent dfbf3c1
commit c63342e
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 15,285 deletions.
diff --git a/meson.build b/meson.build
@@ -119,9 +119,3 @@ if platform != 'windows'
 endif
 
 subdir('src')
-
-enable_tests = get_option('enable_tests')
-
-if enable_tests
-  subdir('tests')
-endif
diff --git a/meson_options.txt b/meson_options.txt
@@ -1,4 +1,3 @@
-option('enable_tests', type : 'boolean', value : false)
 option('enable_dxgi',  type : 'boolean', value : true, description: 'Build DXGI')
 option('enable_d3d9',  type : 'boolean', value : true, description: 'Build D3D9')
 option('enable_d3d10', type : 'boolean', value : true, description: 'Build D3D10')

diff --git a/package-release.sh b/package-release.sh
@@ -63,7 +63,6 @@ function build_arch {
         $opt_strip                                    \
         --bindir "x$1"                                \
         --libdir "x$1"                                \
-        -Denable_tests=false                          \
         -Dbuild_id=$opt_buildid                       \
         "$DXVK_BUILD_DIR/build.$1"
 

diff --git a/src/meson.build b/src/meson.build
@@ -10,7 +10,7 @@ if get_option('enable_dxgi')
   subdir('dxgi')
 endif
 
-if get_option('enable_d3d10') or get_option('enable_d3d11') or get_option('enable_tests')
+if get_option('enable_d3d10') or get_option('enable_d3d11')
   subdir('dxbc')
 endif
 
@@ -31,6 +31,6 @@ if get_option('enable_d3d9')
 endif
 
 # Nothing selected
-if not get_option('enable_d3d9') and not get_option('enable_d3d10') and not get_option('enable_d3d11') and not get_option('enable_tests')
-  warning('Nothing selected to be built. Are you missing a frontend or tests?')
+if not get_option('enable_d3d9') and not get_option('enable_d3d10') and not get_option('enable_d3d11')
+  warning('Nothing selected to be built.?')
 endif
diff --git a/tests/d3d9/meson.build b/tests/d3d9/meson.build
@@ -1,9 +0,0 @@
-test_d3d9_deps = [ util_dep, lib_d3d9, lib_d3dcompiler_47 ]
-
-executable('d3d9-clear'+exe_ext,  files('test_d3d9_clear.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-buffer'+exe_ext,  files('test_d3d9_buffer.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-triangle'+exe_ext,  files('test_d3d9_triangle.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-l6v5u5'+exe_ext,  files('test_d3d9_l6v5u5.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-nv12'+exe_ext,  files('test_d3d9_nv12.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-bc-update-surface'+exe_ext,  files('test_d3d9_bc_update_surface.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)
-executable('d3d9-up'+exe_ext,  files('test_d3d9_up.cpp'),  dependencies : test_d3d9_deps, install : true, gui_app : true)