From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Thu, 26 Mar 2020 13:07:39 +0000 (+0100)
Subject: util: fix process_test path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f573bdaaa7c41b19edf99e891665378b76d8fd4;p=mesa.git

util: fix process_test path

Make sure we only use winepath when needed.

Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Fixes: f8f1413070a ("util/u_process: add util_get_process_exec_path")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2690
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4304>
---

diff --git a/src/util/meson.build b/src/util/meson.build
index 77e3973c1a0..e30029063c0 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -285,12 +285,13 @@ if with_tests
     dependencies : idep_mesautil,
     c_args : [c_msvc_compat_args],
   )
-  if not (host_machine.system() == 'windows')
-    process_test_exe_full_path = process_test_exe.full_path()
-  else
+  if (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
+    # This conversion is only required on mingw
     process_test_exe_full_path = run_command(
       'winepath', '-w', process_test_exe.full_path()
     ).stdout().strip()
+  else
+    process_test_exe_full_path = process_test_exe.full_path()
   endif
 
   test(