From 03006926de1b204085a1c37f9abb7df7ce566e68 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Fri, 3 Sep 2021 15:43:15 -0700
Subject: [PATCH] wgl: Fix unit test when using shared glapi

Reviewed By: Bill Kristiansen <billkris@microsoft.com>

Reviewed-by: Charmaine Lee >charmainel@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12677>
---
 src/gallium/targets/libgl-gdi/meson.build | 6 ++++++
 src/mapi/shared-glapi/meson.build         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index f053abc6bee..41eb84e5544 100644
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -67,10 +67,16 @@ if with_tests
 
   # 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()
+    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],
     )
   endif
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index 68fa50d82e6..3776f9e30ab 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -60,6 +60,7 @@ libglapi = shared_library(
   name_prefix : 'lib',
   install : true,
 )
+libglapi_build_dir = meson.current_build_dir()
 
 if with_any_opengl and with_tests
   test(