Mesa (main): meson: Enable wgl tests on mingw

[GitLab Mirror]

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

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Fri Apr 22 02:09:52 2022 +0800

meson: Enable wgl tests on mingw

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16084>

---

 src/gallium/targets/libgl-gdi/meson.build | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index 1edb4a1ff59..e344090e2e7 100644
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -68,21 +68,18 @@ if with_tests
     dependencies : [idep_gtest, dep_dxheaders, extra_test_deps],
   )
 
-  # The CI pipeline for MinGW doesn't support creating a window, so don't run these tests there
-  if with_tests and cc.get_id() != 'gcc'
-    wgl_test_env = environment()
-    wgl_test_env.append('PATH', libgallium_wgl_build_dir)
-    if with_shared_glapi
-      wgl_test_env.append('PATH', libglapi_build_dir)
-    endif
-
-    test(
-      'wgl',
-      test_wgl,
-      suite : ['wgl'],
-      env : wgl_test_env,
-      depends : [libopengl32],
-      protocol : gtest_test_protocol,
-    )
+  wgl_test_env = environment()
+  wgl_test_env.append('PATH', libgallium_wgl_build_dir)
+  if with_shared_glapi
+    wgl_test_env.append('PATH', libglapi_build_dir)
   endif
+
+  test(
+    'wgl',
+    test_wgl,
+    suite : ['wgl'],
+    env : wgl_test_env,
+    depends : [libopengl32],
+    protocol : gtest_test_protocol,
+  )
 endif