Module: Mesa
Branch: main
Commit: 007d979dbe6a90dd8a6b489600be7284f7aa4019
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=007d979dbe6a90dd8a6b489600be7284f7aa4019

Author: Yonggang Luo <[email protected]>
Date:   Thu Mar 31 07:48:50 2022 +0800

util: Enable tests that disabled for msvc/mingw

mesa-sha1_test.cpp and string_buffer_test.cpp are working fine now

Signed-off-by: Yonggang Luo <[email protected]>
Reviewed-by: Jesse Natalie <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18001>

---

 src/util/meson.build | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/util/meson.build b/src/util/meson.build
index ac02e5d4b9f..5b75ace02db 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -341,10 +341,12 @@ if with_tests
     'tests/fast_urem_by_const_test.cpp',
     'tests/half_float_test.cpp',
     'tests/int_min_max.cpp',
+    'tests/mesa-sha1_test.cpp',
     'tests/rb_tree_test.cpp',
     'tests/register_allocate_test.cpp',
     'tests/roundeven_test.cpp',
     'tests/set_test.cpp',
+    'tests/string_buffer_test.cpp',
     'tests/timespec_test.cpp',
     'tests/u_atomic_test.cpp',
     'tests/u_debug_stack_test.cpp',
@@ -353,20 +355,6 @@ if with_tests
     'tests/vector_test.cpp',
   )
 
-  if not (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
-    # FIXME: These tests fail with mingw, but not with msvc.
-    files_util_tests += files(
-      'tests/string_buffer_test.cpp',
-    )
-  endif
-
-  # FIXME: this test crashes on windows
-  if host_machine.system() != 'windows'
-    files_util_tests += files(
-      'tests/mesa-sha1_test.cpp',
-    )
-  endif
-
   # FIXME: this test cause a big timeout on MacOS
   if host_machine.system() != 'darwin'
     files_util_tests += files(

Reply via email to